Merge pull request #37 from isaac129/deliver

carlatat · web-flow · commit 0da7d4dcc026 · 2018-03-19T10:29:24.000+13:00
Prevent ref count assertion error
diff --git a/ginetflow.c b/ginetflow.c
@@ -740,8 +740,7 @@ static void g_inet_flow_finalize(GObject * object)
     GInetFlow *flow = G_INET_FLOW(object);
     int index = find_expiry_index(flow->lifetime);
     g_queue_unlink(flow->table->expire_queue[index], &flow->list);
-    /* This might not be safe - we'll get called as the hash table is destroyed */
-    g_hash_table_remove(flow->table->table, flow);
+    g_hash_table_steal(flow->table->table, flow);
     G_OBJECT_CLASS(g_inet_flow_parent_class)->finalize(object);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -740,8 +740,7 @@ static void g_inet_flow_finalize(GObject * object)`
`740`	`740`	`GInetFlow *flow = G_INET_FLOW(object);`
`741`	`741`	`int index = find_expiry_index(flow->lifetime);`
`742`	`742`	`g_queue_unlink(flow->table->expire_queue[index], &flow->list);`
`743`		`- /* This might not be safe - we'll get called as the hash table is destroyed */`
`744`		`- g_hash_table_remove(flow->table->table, flow);`
	`743`	`+ g_hash_table_steal(flow->table->table, flow);`
`745`	`744`	`G_OBJECT_CLASS(g_inet_flow_parent_class)->finalize(object);`
`746`	`745`	`}`
`747`	`746`