From: Jaak Ristioja <jaak@ristioja.ee>
Date: Sun, 18 Dec 2016 14:48:46 +0000 (-0500)
Subject: * expand.c (variable_append): [SV 49113] Possible null ptr deref
X-Git-Tag: 4.2.90~113
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9c487cc5376b8438d3d4052dedd6bed90f40cd7e;p=thirdparty%2Fmake.git

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

diff --git a/expand.c b/expand.c
index 0b5fd011..60c60718 100644
--- a/expand.c
+++ b/expand.c
@@ -490,13 +490,15 @@ variable_append (const char *name, unsigned int length,
 {
   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);