From: Thomas Roessler <roessler@does-not-exist.org>
Date: Sat, 8 Sep 2001 14:23:05 +0000 (+0000)
Subject: Thomas Guettler <thomas@thomas-guettler.de> reports a segfault when
X-Git-Tag: mutt-1-3-23-rel~17
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0dd6d28791e3018f6cc4700e26445f4382114e37;p=mutt

Thomas Guettler <thomas@thomas-guettler.de> reports a segfault when
you search for "~b \\${".
---

diff --git a/init.c b/init.c
index 0540b107..8f57ff5e 100644
--- a/init.c
+++ b/init.c
@@ -244,7 +244,7 @@ int mutt_extract_token (BUFFER *dest, BUFFER *tok, int flags)
     }
     else if (ch == '$' && (!qc || qc == '"') && (*tok->dptr == '{' || isalpha ((unsigned char) *tok->dptr)))
     {
-      char *env, *var;
+      char *env = NULL, *var = NULL;
 
       if (*tok->dptr == '{')
       {
@@ -262,7 +262,7 @@ int mutt_extract_token (BUFFER *dest, BUFFER *tok, int flags)
 	var = mutt_substrdup (tok->dptr, pc);
 	tok->dptr = pc;
       }
-      if ((env = getenv (var)))
+      if (var && (env = getenv (var)))
 	mutt_buffer_addstr (dest, env);
       FREE (&var);
     }