From 3cbc4b0773f51454cd5b669a99e9febe1f56ac8a Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Tue, 31 Jul 2012 20:39:29 +0200
Subject: [PATCH] lexical #7/19, express verbosely where `wlist' and `cw' are
 NULL

---
 src/frontend/parser/lexical.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/frontend/parser/lexical.c b/src/frontend/parser/lexical.c
index f626a3fa6..569299f43 100644
--- a/src/frontend/parser/lexical.c
+++ b/src/frontend/parser/lexical.c
@@ -118,7 +118,9 @@ cp_lexer(char *string)
         cp_ccon(TRUE);
         prompt();
     }
-nloop:  i = 0;
+nloop:
+    wlist = cw = NULL;
+    i = 0;
     j = 0;
     paren = 0;
     bzero(linebuf, NEW_BSIZE_SP);
@@ -165,6 +167,7 @@ gotchar:
                 return (NULL);
             while (((c = input(cp_inp_cur)) != '\n') && (c != EOF))
                 ;
+            wlist = cw = NULL;
             goto nloop;
         }
 
@@ -258,6 +261,7 @@ gotchar:
 #else
 		    fputc(linebuf[j], cp_out);	/* But you can't edit */
 #endif
+                wlist = cw = NULL;
                 goto nloop;
             } else    /* EOF during a source */
 	    {
@@ -281,6 +285,7 @@ gotchar:
                 // cp_ccom doesn't mess wlist, read only access to wlist->wl_word
                 cp_ccom(wlist, buf, TRUE);
                 wl_free(wlist);
+                wlist = cw = NULL;
                 goto nloop;
             } goto ldefault; /* else continue with default ... */
 	case ',':