commit 9c487cc5376b8438d3d4052dedd6bed90f40cd7e
author Jaak Ristioja <jaak@ristioja.ee> Sun Dec 18 09:48:46 2016 -0500
committer Paul Smith <psmith@gnu.org> Sun Dec 25 18:18:45 2016 -0500
tree 05da2367e3abd608cb48bd1b86cee3090f2ab064
parent 1c9790e6f5ca26fb1b690b81deb7931726941c09

* expand.c (variable_append): [SV 49113] Possible null ptr deref

expand.c

diff --git a/expand.c b/expand.c
index 0b5fd01..60c6071 100644
--- a/expand.c
+++ b/expand.c
@@ -490,13 +490,15 @@
 {
   const struct variable *v;
   char *buf = 0;
-  /* If this set is local and the next is not a parent, then next is local.  */
-  int nextlocal = local && set->next_is_parent == 0;
+  int nextlocal;
 
   /* If there's nothing left to check, return the empty buffer.  */
   if (!set)
     return initialize_variable_output ();
 
+  /* If this set is local and the next is not a parent, then next is local.  */
+  nextlocal = local && set->next_is_parent == 0;
+
   /* Try to find the variable in this variable set.  */
   v = lookup_variable_in_set (name, length, set->set);