summaryrefslogtreecommitdiff
path: root/Zend/zend_variables.c
diff options
context:
space:
mode:
authorAndi Gutmans <andi@php.net>2001-05-12 13:55:49 +0000
committerAndi Gutmans <andi@php.net>2001-05-12 13:55:49 +0000
commiteadaf3eb7a24a7475cca68c350210fc9f74226c0 (patch)
tree7464280fe35b3fc720b7a26c2b6ff342d2df9ce6 /Zend/zend_variables.c
parente5176fe60a9ffbe211ee016acdcddb18118e4487 (diff)
downloadphp-git-eadaf3eb7a24a7475cca68c350210fc9f74226c0.tar.gz
- 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.
Diffstat (limited to 'Zend/zend_variables.c')
-rw-r--r--Zend/zend_variables.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/Zend/zend_variables.c b/Zend/zend_variables.c
index fb7c1a1642..d551541a5a 100644
--- 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);