Changeset 1e52e1f for query.c

Timestamp:

2010-07-11T10:30:27Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

af9f2ca

Parents:

e92c4f4

Message:

When cleaning up queries, q->data is free()d. Even if it turns out to be
the "struct irc" containing all data belonging to a session. Sanitise
memory management a little bit here. (There are some memory leaks in here
too that need to be fixed at some point.)

File:

• query.c (modified) (3 diffs)

query.c

@@ -31 +31 @@
 
 query_t *query_add( irc_t *irc, struct im_connection *ic, char *question,
-                    query_callback yes, query_callback no, void *data )
+                    query_callback yes, query_callback no, query_callback free,
+                    void *data )
 {
         query_t *q = g_new0( query_t, 1 );
@@ -39 +40 @@
         q->yes = yes;
         q->no = no;
+        q->free = free;
         q->data = data;
         
@@ -94 +96 @@
         
         g_free( q->question );
-        if( q->data ) g_free( q->data ); /* Memory leak... */
+        if( q->free && q->data )
+                q->free( q->data );
         g_free( q );
 }