...

Author: krakjoe

Zend/zend_partial.c

@@ -426,6 +426,7 @@ void zend_partial_startup(void) {
 ZEND_NAMED_FUNCTION(zend_partial_call_magic)
 {
     zend_partial *partial = (zend_partial*) Z_OBJ_P(ZEND_THIS);
+    zend_object *object = NULL;
 	zval *params;
 	uint32_t num_params;
 	HashTable *named_args;
@@ -443,9 +444,9 @@ ZEND_NAMED_FUNCTION(zend_partial_call_magic)
 	fcc.function_handler = &partial->func;
 
 	if (Z_TYPE(partial->This) == IS_OBJECT) {
-	    fci.object =
-	        fcc.object =
-	            zend_partial_this(Z_OBJ(partial->This));
+	    object = fci.object =
+	                fcc.object =
+	                    zend_partial_this(Z_OBJ(partial->This));
 	} else if (Z_TYPE(partial->This) == IS_PTR) {
 	    zend_class_entry *type = Z_PTR(partial->This);
 	    zval instance;
@@ -456,10 +457,10 @@ ZEND_NAMED_FUNCTION(zend_partial_call_magic)
             ZVAL_OBJ(&instance, zend_objects_new(type));
         }
 
-        fci.object =
-            fcc.object =
-                Z_OBJ(instance);
-        GC_ADD_FLAGS(fci.object, IS_OBJ_DESTRUCTOR_CALLED);
+        object = fci.object =
+                    fcc.object =
+                        Z_OBJ(instance);
+        GC_ADD_FLAGS(object, IS_OBJ_DESTRUCTOR_CALLED);
 	}
 
 	memcpy(fci.params, partial->argv, partial->argc * sizeof(zval));
@@ -505,7 +506,7 @@ ZEND_NAMED_FUNCTION(zend_partial_call_magic)
 
     if (!EG(exception)) {
         if (partial->func.common.fn_flags & ZEND_ACC_CTOR) {
-            GC_DEL_FLAGS(fcc.object, IS_OBJ_DESTRUCTOR_CALLED);
+            GC_DEL_FLAGS(object, IS_OBJ_DESTRUCTOR_CALLED);
         }
     }
 
@@ -515,8 +516,8 @@ ZEND_NAMED_FUNCTION(zend_partial_call_magic)
 
     if (partial->func.common.fn_flags & ZEND_ACC_CTOR) {
         zval_ptr_dtor(return_value);
-        
-        RETVAL_OBJ(fci.object);
+
+        RETVAL_OBJ(object);
     }
 
     if (!fcc.function_handler) {