Browse Source

- Add missing check

experimental/with_scalar_types
Felipe Pena 16 years ago
parent
commit
5f31c44509
  1. 3
      Zend/zend_constants.c

3
Zend/zend_constants.c

@ -479,7 +479,8 @@ ZEND_API int zend_register_constant(zend_constant *c TSRMLS_DC)
|| zend_hash_add(EG(zend_constants), name, c->name_len, (void *) c, sizeof(zend_constant), NULL)==FAILURE) {
/* The internal __COMPILER_HALT_OFFSET__ is prefixed by NULL byte */
if (memcmp(name, "\0__COMPILER_HALT_OFFSET__", sizeof("\0__COMPILER_HALT_OFFSET__")) == 0) {
if (c->name[0] == '\0' && c->name_len > sizeof("\0__COMPILER_HALT_OFFSET__")
&& memcmp(name, "\0__COMPILER_HALT_OFFSET__", sizeof("\0__COMPILER_HALT_OFFSET__")) == 0) {
name++;
}
zend_error(E_NOTICE,"Constant %s already defined", name);

Loading…
Cancel
Save