- Add missing check

felipensp · felipensp · commit 5f31c4450950 · 2010-11-14T01:38:52.000Z
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -479,7 +479,8 @@ ZEND_API int zend_register_constant(zend_constant *c TSRMLS_DC)`
`479`	`479`	`\|\| zend_hash_add(EG(zend_constants), name, c->name_len, (void *) c, sizeof(zend_constant), NULL)==FAILURE) {`
`480`	`480`
`481`	`481`	`/* The internal __COMPILER_HALT_OFFSET__ is prefixed by NULL byte */`
`482`		`- if (memcmp(name, "\0__COMPILER_HALT_OFFSET__", sizeof("\0__COMPILER_HALT_OFFSET__")) == 0) {`
	`482`	`+ if (c->name[0] == '\0' && c->name_len > sizeof("\0__COMPILER_HALT_OFFSET__")`
	`483`	`+ && memcmp(name, "\0__COMPILER_HALT_OFFSET__", sizeof("\0__COMPILER_HALT_OFFSET__")) == 0) {`
`483`	`484`	`name++;`
`484`	`485`	`}`
`485`	`486`	`zend_error(E_NOTICE,"Constant %s already defined", name);`