changeset: 6309:6bcde5f1c7a7
user:      Aaron Schrab <[email protected]>
date:      Sun Oct 06 14:32:45 2013 +0000
link:      http://dev.mutt.org/hg/mutt/rev/6bcde5f1c7a7

Ensure that BUFFER variables are initialized to prevent later attempts
to traverse an uninitialized pointer.

diffs (64 lines):

diff -r 132861c8b4e9 -r 6bcde5f1c7a7 commands.c
--- a/commands.c        Sat Oct 05 19:25:00 2013 +0000
+++ b/commands.c        Sun Oct 06 14:32:45 2013 +0000
@@ -617,6 +617,7 @@
   buffer[0] = 0;
   if (mutt_get_field (":", buffer, sizeof (buffer), M_COMMAND) != 0 || 
!buffer[0])
     return;
+  mutt_buffer_init (&err);
   err.dsize = STRING;
   err.data = safe_malloc(err.dsize);
   mutt_buffer_init (&token);
diff -r 132861c8b4e9 -r 6bcde5f1c7a7 hook.c
--- a/hook.c    Sat Oct 05 19:25:00 2013 +0000
+++ b/hook.c    Sun Oct 06 14:32:45 2013 +0000
@@ -281,7 +281,8 @@
   BUFFER err, token;
 
   current_hook_type = M_FOLDERHOOK;
-  
+
+  mutt_buffer_init (&err);
   err.dsize = STRING;
   err.data = safe_malloc (err.dsize);
   mutt_buffer_init (&token);
@@ -332,7 +333,8 @@
   HOOK *hook;
 
   current_hook_type = type;
-  
+
+  mutt_buffer_init (&err);
   err.dsize = STRING;
   err.data = safe_malloc (err.dsize);
   mutt_buffer_init (&token);
@@ -476,6 +478,7 @@
   if (inhook)
     return;
 
+  mutt_buffer_init (&err);
   err.dsize = STRING;
   err.data = safe_malloc (err.dsize);
   mutt_buffer_init (&token);
diff -r 132861c8b4e9 -r 6bcde5f1c7a7 imap/command.c
--- a/imap/command.c    Sat Oct 05 19:25:00 2013 +0000
+++ b/imap/command.c    Sun Oct 06 14:32:45 2013 +0000
@@ -778,6 +778,7 @@
   url_ciss_tostring (&url, buf + 11, sizeof (buf) - 10, 0);
   safe_strcat (buf, sizeof (buf), "\"");
   mutt_buffer_init (&token);
+  mutt_buffer_init (&err);
   err.data = errstr;
   err.dsize = sizeof (errstr);
   if (mutt_parse_rc_line (buf, &token, &err))
diff -r 132861c8b4e9 -r 6bcde5f1c7a7 imap/imap.c
--- a/imap/imap.c       Sat Oct 05 19:25:00 2013 +0000
+++ b/imap/imap.c       Sun Oct 06 14:32:45 2013 +0000
@@ -1828,6 +1828,7 @@
   if (option (OPTIMAPCHECKSUBSCRIBED))
   {
     mutt_buffer_init (&token);
+    mutt_buffer_init (&err);
     err.data = errstr;
     err.dsize = sizeof (errstr);
     snprintf (mbox, sizeof (mbox), "%smailboxes \"%s\"",

Reply via email to