Fixed many memory leaks

ChangeLog

@@ -1,7 +1,7 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
-ChangeLog - 2005-01-27
+ChangeLog - 2005-02-01
 
 
 Version 0.1.0 (under dev!):
@@ -11,11 +11,6 @@ Version 0.1.0 (under dev!):
    * improved completion: now completes commands arguments (IRC and internal),
      when only one completion matches, completion mechanism is stoped (to
      complete command arg for example)
-   * fixed colors bug: removed "gray" color (replaced by "default"), colors are
-     ok when terminal has white (or light) background
-   * fixed crash when multiple servers and big messages received from server
-   * fixed crash when closing some private buffers
-   * fixed crash when unknown section with option(s) in config file
    * improved /set command: empty strings are allowed, new colors, server
      options can be changed while WeeChat is running
    * added default away/part/quit messages in config file
@@ -23,6 +18,12 @@ Version 0.1.0 (under dev!):
      "irc_display_away"
    * server messages & errors are all prefixed (by 3 chars, like '-@-')
    * added new options for charset: look_charset_decode and look_charset_encode
+   * fixed many memory leaks
+   * fixed colors bug: removed "gray" color (replaced by "default"), colors are
+     ok when terminal has white (or light) background
+   * fixed crash when multiple servers and big messages received from server
+   * fixed crash when closing some private buffers
+   * fixed crash when unknown section with option(s) in config file
    * fixed /op, /deop, /voice, /devoice (now ok with many nicks)
    * fixed /me command (now ok without parameter)
    * fixed /away command (now ok if not away)

src/common/command.c

@@ -145,6 +145,19 @@ command_index_build ()
     }
 }
 
+/*
+ * command_index_free: remove all commands in index
+ */
+
+void
+command_index_free ()
+{
+    while (index_commands)
+    {
+        weelist_remove (&index_commands, &last_index_command, index_commands);
+    }
+}
+
 /*
  * alias_search: search an alias
  */
@@ -306,6 +319,17 @@ alias_free (t_weechat_alias *alias)
     weechat_alias = new_weechat_alias;
 }
 
+/*
+ * alias_free_all: free all alias
+ */
+
+void
+alias_free_all ()
+{
+    while (weechat_alias)
+        alias_free (weechat_alias);
+}
+
 /*
  * explode_string: explode a string according to separators
  */

src/common/command.h

@@ -56,7 +56,9 @@ extern t_weelist *index_commands;
 extern t_weelist *last_index_command;
 
 extern void command_index_build ();
+extern void command_index_free ();
 extern t_weechat_alias *alias_new (char *, char *);
+extern void alias_free_all ();
 extern int exec_weechat_command (t_irc_server *, char *);
 extern void user_command (t_irc_server *, char *);
 extern int weechat_cmd_alias (char *);

src/common/history.c

@@ -136,3 +136,50 @@ history_add (void *buffer, char *string)
         }
     }
 }
+
+/*
+ * history_general_free: free general history
+ */
+
+void
+history_general_free ()
+{
+    t_history *ptr_history;
+    
+    while (history_general)
+    {
+        ptr_history = history_general->next_history;
+        if (history_general->text)
+            free (history_general->text);
+        free (history_general);
+        history_general = ptr_history;
+    }
+    history_general = NULL;
+    history_general_last = NULL;
+    history_general_ptr = NULL;
+    num_history_general = 0;
+}
+
+
+/*
+ * history_buffer_free: free history for a buffer
+ */
+
+void
+history_buffer_free (void *buffer)
+{
+    t_history *ptr_history;
+    
+    while (((t_gui_buffer *)(buffer))->history)
+    {
+        ptr_history = ((t_gui_buffer *)(buffer))->history->next_history;
+        if (((t_gui_buffer *)(buffer))->history->text)
+            free (((t_gui_buffer *)(buffer))->history->text);
+        free (((t_gui_buffer *)(buffer))->history);
+        ((t_gui_buffer *)(buffer))->history = ptr_history;
+    }
+    ((t_gui_buffer *)(buffer))->history = NULL;
+    ((t_gui_buffer *)(buffer))->last_history = NULL;
+    ((t_gui_buffer *)(buffer))->ptr_history = NULL;
+    ((t_gui_buffer *)(buffer))->num_history = 0;
+}

src/common/history.h

@@ -31,5 +31,7 @@ struct t_history
 };
 
 extern void history_add (void *, char *);
+extern void history_general_free ();
+extern void history_buffer_free (void *);
 
 #endif /* history.h */

src/common/weechat.c

@@ -60,9 +60,9 @@
 #include "../plugins/plugins.h"
 
 
-int quit_weechat;       /* = 1 if quit request from user... why ? :'(        */
-char *weechat_home;     /* WeeChat home dir. (example: /home/toto/.weechat)  */
-FILE *weechat_log_file; /* WeeChat log file (~/.weechat/weechat.log)         */
+int quit_weechat;               /* = 1 if quit request from user... why ? :'(        */
+char *weechat_home = NULL;      /* WeeChat home dir. (example: /home/toto/.weechat)  */
+FILE *weechat_log_file = NULL;  /* WeeChat log file (~/.weechat/weechat.log)         */
 
 char *local_charset = NULL;     /* local charset, for example: ISO-8859-1    */
 
@@ -264,26 +264,26 @@ wee_parse_args (int argc, char *argv[])
             || (strcmp (argv[i], "--config") == 0))
         {
             wee_display_config_options ();
-            exit (EXIT_SUCCESS);
+            wee_shutdown (EXIT_SUCCESS);
         }
         else if ((strcmp (argv[i], "-h") == 0)
                 || (strcmp (argv[i], "--help") == 0))
         {
             printf ("\n" WEE_USAGE1, argv[0], argv[0]);
             printf ("%s", WEE_USAGE2);
-            exit (EXIT_SUCCESS);
+            wee_shutdown (EXIT_SUCCESS);
         }
         else if ((strcmp (argv[i], "-l") == 0)
                  || (strcmp (argv[i], "--license") == 0))
         {
             printf ("\n%s%s", WEE_LICENSE);
-            exit (EXIT_SUCCESS);
+            wee_shutdown (EXIT_SUCCESS);
         }
         else if ((strcmp (argv[i], "-v") == 0)
                  || (strcmp (argv[i], "--version") == 0))
         {
             printf (PACKAGE_VERSION "\n");
-            exit (EXIT_SUCCESS);
+            wee_shutdown (EXIT_SUCCESS);
         }
         else if ((strncasecmp (argv[i], "irc://", 6) == 0))
         {
@@ -358,7 +358,7 @@ wee_create_home_dirs ()
     {
         fprintf (stderr, _("%s unable to get HOME directory\n"),
                  WEECHAT_ERROR);
-        exit (EXIT_FAILURE);
+        wee_shutdown (EXIT_FAILURE);
     }
     dir_length = strlen (ptr_home) + 10;
     weechat_home =
@@ -367,7 +367,7 @@ wee_create_home_dirs ()
     {
         fprintf (stderr, _("%s not enough memory for home directory\n"),
                  WEECHAT_ERROR);
-        exit (EXIT_FAILURE);
+        wee_shutdown (EXIT_FAILURE);
     }
     snprintf (weechat_home, dir_length, "%s%s.weechat", ptr_home,
               DIR_SEPARATOR);
@@ -377,7 +377,7 @@ wee_create_home_dirs ()
     {
         fprintf (stderr, _("%s unable to create ~/.weechat directory\n"),
                  WEECHAT_ERROR);
-        exit (EXIT_FAILURE);
+        wee_shutdown (EXIT_FAILURE);
     }
     
     dir_length = strlen (weechat_home) + 64;
@@ -509,18 +509,32 @@ weechat_welcome_message ()
 }
 
 /*
- * wee_shutdown: shutdown WeeChat
+ * wee_gui_shutdown: shutdown WeeChat GUI
  */
 
 void
-wee_shutdown ()
+wee_gui_shutdown ()
 {
     dcc_end ();
     server_free_all ();
     gui_end ();
+}
+
+/*
+ * wee_shutdown: shutdown WeeChat
+ */
+
+void
+wee_shutdown (int return_code)
+{
+    if (weechat_home)
+        free (weechat_home);
     if (weechat_log_file)
         fclose (weechat_log_file);
-    exit (EXIT_SUCCESS);
+    if (local_charset)
+        free (local_charset);
+    alias_free_all ();
+    exit (return_code);
 }
 
 /*
@@ -572,7 +586,9 @@ main (int argc, char *argv[])
     plugin_end ();                  /* end plugin interface(s)              */
     server_disconnect_all ();       /* disconnect from all servers          */
     (void) config_write (NULL);     /* save config file                     */
-    wee_shutdown ();                /* quit WeeChat (oh no, why?)           */
+    command_index_free ();          /* free commands index                  */
+    wee_gui_shutdown ();            /* shut down WeeChat GUI                */
+    wee_shutdown (EXIT_SUCCESS);    /* quit WeeChat (oh no, why?)           */
     
     return EXIT_SUCCESS;            /* make gcc happy (never executed)      */
 }

src/common/weechat.h

@@ -105,6 +105,6 @@ extern char *local_charset;
 extern char *weechat_convert_encoding (char *, char *, char *);
 extern long get_timeval_diff (struct timeval *, struct timeval *);
 extern void wee_log_printf (char *, ...);
-extern void wee_shutdown ();
+extern void wee_shutdown (int);
 
 #endif /* weechat.h */

src/gui/curses/gui-display.c

@@ -1947,6 +1947,19 @@ gui_end ()
         gui_buffer_free (gui_buffers, 0);
     }
     
+    /* delete all windows */
+    while (gui_windows)
+    {
+        gui_window_free (gui_windows);
+    }
+    
+    /* delete general history */
+    history_general_free ();
+    
+    /* delete infobar messages */
+    while (gui_infobar)
+        gui_infobar_remove ();
+    
     /* end of curses output */
     refresh ();
     endwin ();

src/gui/curses/gui-input.c

@@ -89,6 +89,7 @@ gui_read_keyb ()
             /* remove last infobar message */
             case KEY_F(10):
                 gui_infobar_remove ();
+                gui_draw_buffer_infobar (gui_current_window->buffer, 1);
                 break;
             /* cursor up */
             case KEY_UP:
@@ -666,7 +667,10 @@ gui_main_loop ()
             {
                 gui_infobar->remaining_time--;
                 if (gui_infobar->remaining_time == 0)
+                {
                     gui_infobar_remove ();
+                    gui_draw_buffer_infobar (gui_current_window->buffer, 1);
+                }
             }
             check_away++;
             if (check_away >= CHECK_AWAY_DELAY)

src/gui/gui-common.c

@@ -329,6 +329,26 @@ gui_infobar_printf (int time_displayed, int color, char *message, ...)
     free (buf2);
 }
 
+/*
+ * gui_window_free: delete a window
+ */
+
+void
+gui_window_free (t_gui_window *window)
+{
+    /* remove window from windows list */
+    if (window->prev_window)
+        window->prev_window->next_window = window->next_window;
+    if (window->next_window)
+        window->next_window->prev_window = window->prev_window;
+    if (gui_windows == window)
+        gui_windows = window->next_window;
+    if (last_gui_window == window)
+        last_gui_window = window->prev_window;
+    
+    free (window);
+}
+
 /*
  * gui_infobar_remove: remove last displayed message in infobar
  */
@@ -345,7 +365,6 @@ gui_infobar_remove ()
             free (gui_infobar->text);
         free (gui_infobar);
         gui_infobar = new_infobar;
-        gui_draw_buffer_infobar (gui_current_window->buffer, 1);
     }
 }
 
@@ -423,6 +442,8 @@ gui_buffer_free (t_gui_buffer *buffer, int switch_to_another)
     
     completion_free (&(buffer->completion));
     
+    history_buffer_free (buffer);
+    
     /* remove buffer from buffers list */
     if (buffer->prev_buffer)
         buffer->prev_buffer->next_buffer = buffer->next_buffer;

src/gui/gui.h

@@ -255,6 +255,7 @@ extern t_gui_buffer *gui_buffer_new (t_gui_window *, void *, void *, int, int);
 extern void gui_buffer_clear (t_gui_buffer *);
 extern void gui_buffer_clear_all ();
 extern void gui_infobar_printf (int, int, char *, ...);
+extern void gui_window_free (t_gui_window *);
 extern void gui_infobar_remove ();
 extern void gui_buffer_free (t_gui_buffer *, int);
 extern t_gui_line *gui_new_line (t_gui_buffer *);

src/irc/irc-server.c

@@ -596,6 +596,9 @@ server_msgq_flush ()
                                     WEECHAT_ERROR, command, args);
                         break;
                 }
+                
+                if (command)
+                    free (command);
             }
             
             free (entire_line);

src/plugins/plugins.c

@@ -92,6 +92,7 @@ plugin_auto_load (int plugin_type, char *directory)
                 plugin_load (plugin_type, entry->d_name);
             }
         }
+        closedir (dir);
     }
     
     /* restore working directory */

weechat/ChangeLog

@@ -1,7 +1,7 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
-ChangeLog - 2005-01-27
+ChangeLog - 2005-02-01
 
 
 Version 0.1.0 (under dev!):
@@ -11,11 +11,6 @@ Version 0.1.0 (under dev!):
    * improved completion: now completes commands arguments (IRC and internal),
      when only one completion matches, completion mechanism is stoped (to
      complete command arg for example)
-   * fixed colors bug: removed "gray" color (replaced by "default"), colors are
-     ok when terminal has white (or light) background
-   * fixed crash when multiple servers and big messages received from server
-   * fixed crash when closing some private buffers
-   * fixed crash when unknown section with option(s) in config file
    * improved /set command: empty strings are allowed, new colors, server
      options can be changed while WeeChat is running
    * added default away/part/quit messages in config file
@@ -23,6 +18,12 @@ Version 0.1.0 (under dev!):
      "irc_display_away"
    * server messages & errors are all prefixed (by 3 chars, like '-@-')
    * added new options for charset: look_charset_decode and look_charset_encode
+   * fixed many memory leaks
+   * fixed colors bug: removed "gray" color (replaced by "default"), colors are
+     ok when terminal has white (or light) background
+   * fixed crash when multiple servers and big messages received from server
+   * fixed crash when closing some private buffers
+   * fixed crash when unknown section with option(s) in config file
    * fixed /op, /deop, /voice, /devoice (now ok with many nicks)
    * fixed /me command (now ok without parameter)
    * fixed /away command (now ok if not away)

weechat/src/common/command.c

@@ -145,6 +145,19 @@ command_index_build ()
     }
 }
 
+/*
+ * command_index_free: remove all commands in index
+ */
+
+void
+command_index_free ()
+{
+    while (index_commands)
+    {
+        weelist_remove (&index_commands, &last_index_command, index_commands);
+    }
+}
+
 /*
  * alias_search: search an alias
  */
@@ -306,6 +319,17 @@ alias_free (t_weechat_alias *alias)
     weechat_alias = new_weechat_alias;
 }
 
+/*
+ * alias_free_all: free all alias
+ */
+
+void
+alias_free_all ()
+{
+    while (weechat_alias)
+        alias_free (weechat_alias);
+}
+
 /*
  * explode_string: explode a string according to separators
  */

weechat/src/common/command.h

@@ -56,7 +56,9 @@ extern t_weelist *index_commands;
 extern t_weelist *last_index_command;
 
 extern void command_index_build ();
+extern void command_index_free ();
 extern t_weechat_alias *alias_new (char *, char *);
+extern void alias_free_all ();
 extern int exec_weechat_command (t_irc_server *, char *);
 extern void user_command (t_irc_server *, char *);
 extern int weechat_cmd_alias (char *);

weechat/src/common/history.c

@@ -136,3 +136,50 @@ history_add (void *buffer, char *string)
         }
     }
 }
+
+/*
+ * history_general_free: free general history
+ */
+
+void
+history_general_free ()
+{
+    t_history *ptr_history;
+    
+    while (history_general)
+    {
+        ptr_history = history_general->next_history;
+        if (history_general->text)
+            free (history_general->text);
+        free (history_general);
+        history_general = ptr_history;
+    }
+    history_general = NULL;
+    history_general_last = NULL;
+    history_general_ptr = NULL;
+    num_history_general = 0;
+}
+
+
+/*
+ * history_buffer_free: free history for a buffer
+ */
+
+void
+history_buffer_free (void *buffer)
+{
+    t_history *ptr_history;
+    
+    while (((t_gui_buffer *)(buffer))->history)
+    {
+        ptr_history = ((t_gui_buffer *)(buffer))->history->next_history;
+        if (((t_gui_buffer *)(buffer))->history->text)
+            free (((t_gui_buffer *)(buffer))->history->text);
+        free (((t_gui_buffer *)(buffer))->history);
+        ((t_gui_buffer *)(buffer))->history = ptr_history;
+    }
+    ((t_gui_buffer *)(buffer))->history = NULL;
+    ((t_gui_buffer *)(buffer))->last_history = NULL;
+    ((t_gui_buffer *)(buffer))->ptr_history = NULL;
+    ((t_gui_buffer *)(buffer))->num_history = 0;
+}

weechat/src/common/history.h

@@ -31,5 +31,7 @@ struct t_history
 };
 
 extern void history_add (void *, char *);
+extern void history_general_free ();
+extern void history_buffer_free (void *);
 
 #endif /* history.h */

weechat/src/common/weechat.c

@@ -60,9 +60,9 @@
 #include "../plugins/plugins.h"
 
 
-int quit_weechat;       /* = 1 if quit request from user... why ? :'(        */
-char *weechat_home;     /* WeeChat home dir. (example: /home/toto/.weechat)  */
-FILE *weechat_log_file; /* WeeChat log file (~/.weechat/weechat.log)         */
+int quit_weechat;               /* = 1 if quit request from user... why ? :'(        */
+char *weechat_home = NULL;      /* WeeChat home dir. (example: /home/toto/.weechat)  */
+FILE *weechat_log_file = NULL;  /* WeeChat log file (~/.weechat/weechat.log)         */
 
 char *local_charset = NULL;     /* local charset, for example: ISO-8859-1    */
 
@@ -264,26 +264,26 @@ wee_parse_args (int argc, char *argv[])
             || (strcmp (argv[i], "--config") == 0))
         {
             wee_display_config_options ();
-            exit (EXIT_SUCCESS);
+            wee_shutdown (EXIT_SUCCESS);
         }
         else if ((strcmp (argv[i], "-h") == 0)
                 || (strcmp (argv[i], "--help") == 0))
         {
             printf ("\n" WEE_USAGE1, argv[0], argv[0]);
             printf ("%s", WEE_USAGE2);
-            exit (EXIT_SUCCESS);
+            wee_shutdown (EXIT_SUCCESS);
         }
         else if ((strcmp (argv[i], "-l") == 0)
                  || (strcmp (argv[i], "--license") == 0))
         {
             printf ("\n%s%s", WEE_LICENSE);
-            exit (EXIT_SUCCESS);
+            wee_shutdown (EXIT_SUCCESS);
         }
         else if ((strcmp (argv[i], "-v") == 0)
                  || (strcmp (argv[i], "--version") == 0))
         {
             printf (PACKAGE_VERSION "\n");
-            exit (EXIT_SUCCESS);
+            wee_shutdown (EXIT_SUCCESS);
         }
         else if ((strncasecmp (argv[i], "irc://", 6) == 0))
         {
@@ -358,7 +358,7 @@ wee_create_home_dirs ()
     {
         fprintf (stderr, _("%s unable to get HOME directory\n"),
                  WEECHAT_ERROR);
-        exit (EXIT_FAILURE);
+        wee_shutdown (EXIT_FAILURE);
     }
     dir_length = strlen (ptr_home) + 10;
     weechat_home =
@@ -367,7 +367,7 @@ wee_create_home_dirs ()
     {
         fprintf (stderr, _("%s not enough memory for home directory\n"),
                  WEECHAT_ERROR);
-        exit (EXIT_FAILURE);
+        wee_shutdown (EXIT_FAILURE);
     }
     snprintf (weechat_home, dir_length, "%s%s.weechat", ptr_home,
               DIR_SEPARATOR);
@@ -377,7 +377,7 @@ wee_create_home_dirs ()
     {
         fprintf (stderr, _("%s unable to create ~/.weechat directory\n"),
                  WEECHAT_ERROR);
-        exit (EXIT_FAILURE);
+        wee_shutdown (EXIT_FAILURE);
     }
     
     dir_length = strlen (weechat_home) + 64;
@@ -509,18 +509,32 @@ weechat_welcome_message ()
 }
 
 /*
- * wee_shutdown: shutdown WeeChat
+ * wee_gui_shutdown: shutdown WeeChat GUI
  */
 
 void
-wee_shutdown ()
+wee_gui_shutdown ()
 {
     dcc_end ();
     server_free_all ();
     gui_end ();
+}
+
+/*
+ * wee_shutdown: shutdown WeeChat
+ */
+
+void
+wee_shutdown (int return_code)
+{
+    if (weechat_home)
+        free (weechat_home);
     if (weechat_log_file)
         fclose (weechat_log_file);
-    exit (EXIT_SUCCESS);
+    if (local_charset)
+        free (local_charset);
+    alias_free_all ();
+    exit (return_code);
 }
 
 /*
@@ -572,7 +586,9 @@ main (int argc, char *argv[])
     plugin_end ();                  /* end plugin interface(s)              */
     server_disconnect_all ();       /* disconnect from all servers          */
     (void) config_write (NULL);     /* save config file                     */
-    wee_shutdown ();                /* quit WeeChat (oh no, why?)           */
+    command_index_free ();          /* free commands index                  */
+    wee_gui_shutdown ();            /* shut down WeeChat GUI                */
+    wee_shutdown (EXIT_SUCCESS);    /* quit WeeChat (oh no, why?)           */
     
     return EXIT_SUCCESS;            /* make gcc happy (never executed)      */
 }

weechat/src/common/weechat.h

@@ -105,6 +105,6 @@ extern char *local_charset;
 extern char *weechat_convert_encoding (char *, char *, char *);
 extern long get_timeval_diff (struct timeval *, struct timeval *);
 extern void wee_log_printf (char *, ...);
-extern void wee_shutdown ();
+extern void wee_shutdown (int);
 
 #endif /* weechat.h */

weechat/src/gui/curses/gui-display.c

@@ -1947,6 +1947,19 @@ gui_end ()
         gui_buffer_free (gui_buffers, 0);
     }
     
+    /* delete all windows */
+    while (gui_windows)
+    {
+        gui_window_free (gui_windows);
+    }
+    
+    /* delete general history */
+    history_general_free ();
+    
+    /* delete infobar messages */
+    while (gui_infobar)
+        gui_infobar_remove ();
+    
     /* end of curses output */
     refresh ();
     endwin ();

weechat/src/gui/curses/gui-input.c

@@ -89,6 +89,7 @@ gui_read_keyb ()
             /* remove last infobar message */
             case KEY_F(10):
                 gui_infobar_remove ();
+                gui_draw_buffer_infobar (gui_current_window->buffer, 1);
                 break;
             /* cursor up */
             case KEY_UP:
@@ -666,7 +667,10 @@ gui_main_loop ()
             {
                 gui_infobar->remaining_time--;
                 if (gui_infobar->remaining_time == 0)
+                {
                     gui_infobar_remove ();
+                    gui_draw_buffer_infobar (gui_current_window->buffer, 1);
+                }
             }
             check_away++;
             if (check_away >= CHECK_AWAY_DELAY)

weechat/src/gui/gui-common.c

@@ -329,6 +329,26 @@ gui_infobar_printf (int time_displayed, int color, char *message, ...)
     free (buf2);
 }
 
+/*
+ * gui_window_free: delete a window
+ */
+
+void
+gui_window_free (t_gui_window *window)
+{
+    /* remove window from windows list */
+    if (window->prev_window)
+        window->prev_window->next_window = window->next_window;
+    if (window->next_window)
+        window->next_window->prev_window = window->prev_window;
+    if (gui_windows == window)
+        gui_windows = window->next_window;
+    if (last_gui_window == window)
+        last_gui_window = window->prev_window;
+    
+    free (window);
+}
+
 /*
  * gui_infobar_remove: remove last displayed message in infobar
  */
@@ -345,7 +365,6 @@ gui_infobar_remove ()
             free (gui_infobar->text);
         free (gui_infobar);
         gui_infobar = new_infobar;
-        gui_draw_buffer_infobar (gui_current_window->buffer, 1);
     }
 }
 
@@ -423,6 +442,8 @@ gui_buffer_free (t_gui_buffer *buffer, int switch_to_another)
     
     completion_free (&(buffer->completion));
     
+    history_buffer_free (buffer);
+    
     /* remove buffer from buffers list */
     if (buffer->prev_buffer)
         buffer->prev_buffer->next_buffer = buffer->next_buffer;

weechat/src/gui/gui.h

@@ -255,6 +255,7 @@ extern t_gui_buffer *gui_buffer_new (t_gui_window *, void *, void *, int, int);
 extern void gui_buffer_clear (t_gui_buffer *);
 extern void gui_buffer_clear_all ();
 extern void gui_infobar_printf (int, int, char *, ...);
+extern void gui_window_free (t_gui_window *);
 extern void gui_infobar_remove ();
 extern void gui_buffer_free (t_gui_buffer *, int);
 extern t_gui_line *gui_new_line (t_gui_buffer *);

weechat/src/irc/irc-server.c

@@ -596,6 +596,9 @@ server_msgq_flush ()
                                     WEECHAT_ERROR, command, args);
                         break;
                 }
+                
+                if (command)
+                    free (command);
             }
             
             free (entire_line);

weechat/src/plugins/plugins.c

@@ -92,6 +92,7 @@ plugin_auto_load (int plugin_type, char *directory)
                 plugin_load (plugin_type, entry->d_name);
             }
         }
+        closedir (dir);
     }
     
     /* restore working directory */