]> granicus.if.org Git - php/commitdiff
Fixed __COMPILER_HALT_OFFSET handling
authorDmitry Stogov <dmitry@zend.com>
Fri, 28 Feb 2014 09:15:40 +0000 (13:15 +0400)
committerDmitry Stogov <dmitry@zend.com>
Fri, 28 Feb 2014 09:15:40 +0000 (13:15 +0400)
Zend/zend_constants.c

index cf9802b498d953bc3144fa9a9d7d36d300045feb..0f0af50b66222b91626a057c0d1a75a13ca3eafe 100644 (file)
@@ -488,12 +488,12 @@ ZEND_API int zend_register_constant(zend_constant *c TSRMLS_DC)
        }
 
        /* Check if the user is trying to define the internal pseudo constant name __COMPILER_HALT_OFFSET__ */
-       if ((c->name->len == sizeof("__COMPILER_HALT_OFFSET__")
+       if ((c->name->len == sizeof("__COMPILER_HALT_OFFSET__")-1
                && !memcmp(name->val, "__COMPILER_HALT_OFFSET__", sizeof("__COMPILER_HALT_OFFSET__")-1))
                || zend_hash_add_mem(EG(zend_constants), name, c, sizeof(zend_constant)) == NULL) {
                
                /* The internal __COMPILER_HALT_OFFSET__ is prefixed by NULL byte */
-               if (c->name->val[0] == '\0' && c->name->len > sizeof("\0__COMPILER_HALT_OFFSET__")
+               if (c->name->val[0] == '\0' && c->name->len > sizeof("\0__COMPILER_HALT_OFFSET__")-1
                        && memcmp(name->val, "\0__COMPILER_HALT_OFFSET__", sizeof("\0__COMPILER_HALT_OFFSET__")) == 0) {
 //???                  name++;
                }