Changeset 1e52e1f

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.)

Files:

• ipc.c (modified) (1 diff)
• protocols/nogaim.c (modified) (3 diffs)
• protocols/purple/purple.c (modified) (1 diff)
• query.c (modified) (3 diffs)
• query.h (modified) (2 diffs)

ipc.c

@@ -324 +324 @@
                                    "Would you like to take over this session?",
                                    ipc_child_cmd_takeover_yes,
-                                   ipc_child_cmd_takeover_no, irc );
+                                   ipc_child_cmd_takeover_no, NULL, irc );
                 
                 /* This one's going to connect to accounts, avoid that. */

protocols/nogaim.c

@@ -380 +380 @@
                query_callback doit, query_callback dont )
 {
-        query_add( (irc_t *) ic->bee->ui_data, ic, msg, doit, dont, data );
+        query_add( (irc_t *) ic->bee->ui_data, ic, msg, doit, dont, g_free, data );
 }
 
@@ -478 +478 @@
         data->handle = g_strdup( handle );
         query_add( (irc_t *) ic->bee->ui_data, ic, s,
-                   imcb_ask_auth_cb_yes, imcb_ask_auth_cb_no, data );
+                   imcb_ask_auth_cb_yes, imcb_ask_auth_cb_no, g_free, data );
 }
 
@@ -511 +511 @@
         data->handle = g_strdup( handle );
         query_add( (irc_t *) ic->bee->ui_data, ic, s,
-                   imcb_ask_add_cb_yes, imcb_ask_add_cb_no, data );
+                   imcb_ask_add_cb_yes, imcb_ask_add_cb_no, g_free, data );
 }
 

protocols/purple/purple.c

@@ -877 +877 @@
         q = g_strdup_printf( "Request: %s\n\n%s\n\n%s", title, primary, secondary );
         pqad->bee_data = query_add( local_bee->ui_data, purple_ic_by_pa( account ), q,
-                prplcb_request_action_yes, prplcb_request_action_no, pqad );
+                prplcb_request_action_yes, prplcb_request_action_no, g_free, pqad );
         
         g_free( q );

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 );
 }

query.h

@@ -33 +33 @@
         struct im_connection *ic;
         char *question;
-        query_callback yes, no;
+        query_callback yes, no, free;
         void *data;
         struct query *next;
@@ -39 +39 @@
 
 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 );
 void query_del( irc_t *irc, query_t *q );
 void query_del_by_conn( irc_t *irc, struct im_connection *ic );