diff options
| author | Felipe Pena <felipe@php.net> | 2010-11-14 01:38:52 +0000 |
|---|---|---|
| committer | Felipe Pena <felipe@php.net> | 2010-11-14 01:38:52 +0000 |
| commit | 5f31c445095089154d32282a28c1b7920cac6579 (patch) | |
| tree | 8a4603d0dd8b3653123dc776f121e98d7ab5a5c9 /Zend/zend_constants.c | |
| parent | 25aee9cad951b018d615c069373325160847cd4a (diff) | |
| download | php-git-5f31c445095089154d32282a28c1b7920cac6579.tar.gz | |
- Add missing check
Diffstat (limited to 'Zend/zend_constants.c')
| -rw-r--r-- | Zend/zend_constants.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Zend/zend_constants.c b/Zend/zend_constants.c index 22b31fec87..2a65c9f05a 100644 --- a/Zend/zend_constants.c +++ b/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); |