]> granicus.if.org Git - php/commitdiff
Revert bogus patch
authorZeev Suraski <zeev@php.net>
Thu, 19 Jul 2001 14:11:40 +0000 (14:11 +0000)
committerZeev Suraski <zeev@php.net>
Thu, 19 Jul 2001 14:11:40 +0000 (14:11 +0000)
Zend/zend_execute.c

index 668ab19fe40b26b51066ce3bb24788f7542213d9..bb7917c2417434faef9d0d8499588d673b970ec4 100644 (file)
@@ -1650,13 +1650,8 @@ do_fcall_common:
                                                
                                                retval_ptr_ptr = get_zval_ptr_ptr(&opline->op1, Ts, BP_VAR_W);
 
-                                               if (*retval_ptr_ptr==EG(uninitialized_zval_ptr)
-                                                       || *retval_ptr_ptr==EG(error_zval_ptr)) {
-                                                       ALLOC_INIT_ZVAL(*retval_ptr_ptr);
-                                               } else {
-                                                       SEPARATE_ZVAL_TO_MAKE_IS_REF(retval_ptr_ptr);
-                                                       (*retval_ptr_ptr)->refcount++;
-                                               }
+                                               SEPARATE_ZVAL_TO_MAKE_IS_REF(retval_ptr_ptr);
+                                               (*retval_ptr_ptr)->refcount++;
                                                
                                                (*EG(return_value_ptr_ptr)) = (*retval_ptr_ptr);
                                        } else {