Changeset 8dbe021f

Timestamp:

2008-04-04T23:13:07Z (16 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

f3351f0

Parents:

883a398

Message:

Don't pass an account_t pointer directly to query_add() since query_del()
wants to free it! Passing an indirect pointer instead.

File:

• root_commands.c (modified) (4 diffs)

root_commands.c

@@ -206 +206 @@
 void cmd_account_del_yes( gpointer w, void *data )
 {
-        account_t *a = data;
-        irc_t *irc = a->irc;
-        
-        if( a->ic )
+        account_t **aptr = data;
+        irc_t *irc = (*aptr)->irc;
+        
+        if( (*aptr)->ic )
         {
                 irc_usermsg( irc, "Account is still logged in, can't delete" );
@@ -215 +215 @@
         else
         {
-                account_del( irc, a );
+                account_del( irc, (*aptr) );
                 irc_usermsg( irc, "Account deleted" );
         }
+        g_free( aptr );
 }
 
 void cmd_account_del_no( gpointer w, void *data )
 {
+        g_free( data );
 }
 
@@ -278 +280 @@
                 else
                 {
+                        account_t **aptr;
                         char *msg;
+                        
+                        aptr = g_malloc( sizeof( aptr ) );
+                        *aptr = a;
                         
                         msg = g_strdup_printf( "If you remove this account (%s(%s)), BitlBee will "
@@ -285 +291 @@
                                                "set' command. Are you sure you want to delete this "
                                                "account?", a->prpl->name, a->user );
-                        query_add( irc, NULL, msg, cmd_account_del_yes, cmd_account_del_no, a );
+                        query_add( irc, NULL, msg, cmd_account_del_yes, cmd_account_del_no, aptr );
                         g_free( msg );
                 }