summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Boerger <helly@php.net>2004-07-13 19:22:11 +0000
committerMarcus Boerger <helly@php.net>2004-07-13 19:22:11 +0000
commit1ea22c90046bc51543dd5a606ff83823056654a1 (patch)
tree692195866dd72a6176dd22d1fecfdbf43fce8bb0
parent399e2ca69f811f7c83050d0883618ff98ebe989c (diff)
downloadphp-git-1ea22c90046bc51543dd5a606ff83823056654a1.tar.gz
Bugfix #29116 Zend constant warning uses memory after free (jdolecek at NetBSD dot org)
-rw-r--r--Zend/zend_constants.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_constants.c b/Zend/zend_constants.c
index dfcc1ae562..0b913edbe5 100644
--- a/Zend/zend_constants.c
+++ b/Zend/zend_constants.c
@@ -317,11 +317,11 @@ ZEND_API int zend_register_constant(zend_constant *c TSRMLS_DC)
}
if (zend_hash_add(EG(zend_constants), name, c->name_len, (void *) c, sizeof(zend_constant), NULL)==FAILURE) {
+ zend_error(E_NOTICE,"Constant %s already defined", name);
free(c->name);
if (!(c->flags & CONST_PERSISTENT)) {
zval_dtor(&c->value);
}
- zend_error(E_NOTICE,"Constant %s already defined", name);
ret = FAILURE;
}
if (lowercase_name) {