From: Stefan Marr <gron@php.net>
Date: Sat, 23 Jul 2011 18:12:31 +0000 (+0000)
Subject: Fixed incorrect initialization when copied op_array.vars was NULL (TRAITS)
X-Git-Tag: php-5.4.0alpha3~81
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9a483afa5bf4917cf59132bc884ad7b7033938c5;p=php

Fixed incorrect initialization when copied op_array.vars was NULL (TRAITS)
---

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 17f861d092..035a9b1a4f 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -3502,15 +3502,20 @@ static void zend_traits_duplicate_function(zend_function *fe, char *newname TSRM
 	fe->op_array.refcount = emalloc(sizeof(zend_uint));
 	*(fe->op_array.refcount) = 1;
 
-	i = fe->op_array.last_var;
-	dupvars = safe_emalloc(fe->op_array.last_var, sizeof(zend_compiled_variable), 0);
-	while (i > 0) {
-		i--;
-		dupvars[i].name = estrndup(fe->op_array.vars[i].name, fe->op_array.vars[i].name_len);
-		dupvars[i].name_len = fe->op_array.vars[i].name_len;
-		dupvars[i].hash_value = fe->op_array.vars[i].hash_value;
-	}
-	fe->op_array.vars = dupvars;
+  if (fe->op_array.vars) {
+    i = fe->op_array.last_var;
+    dupvars = safe_emalloc(fe->op_array.last_var, sizeof(zend_compiled_variable), 0);
+    while (i > 0) {
+      i--;
+      dupvars[i].name = estrndup(fe->op_array.vars[i].name, fe->op_array.vars[i].name_len);
+      dupvars[i].name_len = fe->op_array.vars[i].name_len;
+      dupvars[i].hash_value = fe->op_array.vars[i].hash_value;
+    }
+    fe->op_array.vars = dupvars;
+  }
+	else {
+    fe->op_array.vars = NULL;
+  }
 
 	opcode_copy = safe_emalloc(sizeof(zend_op), fe->op_array.last, 0);
 	for(i = 0; i < fe->op_array.last; i++) {