From 339d82c72ddd7afc90a14c91b4ff8c47d12e1881 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Fri, 28 Feb 2014 13:15:40 +0400 Subject: [PATCH] Fixed __COMPILER_HALT_OFFSET handling --- Zend/zend_constants.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Zend/zend_constants.c b/Zend/zend_constants.c index cf9802b498..0f0af50b66 100644 --- a/Zend/zend_constants.c +++ b/Zend/zend_constants.c @@ -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++; } -- 2.40.0