Patch patch-dont-ruine-uninitialized-ptr for Scripting Engine problem Bug #52001

Patch version 2010-06-08 02:40 UTC

Obsolete patches:

• patch-zend-fetch-make-ref-uninitialized-ptr, revision 2010-06-06 17:03 UTC

• 2010-06-08 02:40 UTC [diff to current]

Developer: boldin.pavel@gmail.com

diff -NurpP -x '*~' php-5.3.2.orig/Zend/zend_vm_def.h php-5.3.2.new//Zend/zend_vm_def.h
--- php-5.3.2.orig/Zend/zend_vm_def.h	2010-01-05 23:46:53.000000000 +0300
+++ php-5.3.2.new//Zend/zend_vm_def.h	2010-06-06 20:58:27.000000000 +0400
@@ -995,7 +995,8 @@ ZEND_VM_HELPER_EX(zend_fetch_var_address
 		zval_dtor(varname);
 	}
 	if (!RETURN_VALUE_UNUSED(&opline->result)) {
-		if (opline->extended_value & ZEND_FETCH_MAKE_REF) {
+		if (opline->extended_value & ZEND_FETCH_MAKE_REF &&
+		    retval != &EG(uninitialized_zval_ptr) ) {
 			SEPARATE_ZVAL_TO_MAKE_IS_REF(retval);
 		}
 		PZVAL_LOCK(*retval);