- Remove check for ht == NULL in copy_ctor.

  If ht is NULL at this point then we are better off crashing and fixing
  the bug that caused it.

diff --git a/Zend/zend_variables.c b/Zend/zend_variables.c
index fb7c1a1642e9bd4d4d2a4620796f28e9ecb43434..d551541a5a21f376cecd8950f6ae49d403b64147 100644 (file)
--- a/Zend/zend_variables.c
+++ b/Zend/zend_variables.c
@@ -122,10 +122,7 @@ ZEND_API int _zval_copy_ctor(zval *zvalue ZEND_FILE_LINE_DC)
                                HashTable *original_ht = zvalue->value.ht;
                                ELS_FETCH();
 
-                               if (!zvalue->value.ht) {
-                                       var_reset(zvalue);
-                                       return FAILURE;
-                               } else if (zvalue->value.ht==&EG(symbol_table)) {
+                               if (zvalue->value.ht == &EG(symbol_table)) {
                                        return SUCCESS; /* do nothing */
                                }
                                ALLOC_HASHTABLE_REL(zvalue->value.ht);