- Fix the constant detection

felipensp · felipensp · commit c95e919e3e81 · 2010-11-13T19:50:55.000Z
diff --git a/Zend/zend_constants.c b/Zend/zend_constants.c
@@ -479,7 +479,7 @@ 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 (strncmp(name+1, "__COMPILER_HALT_OFFSET__", sizeof("__COMPILER_HALT_OFFSET__")) == 0) {
+		if (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,7 @@ 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 (strncmp(name+1, "__COMPILER_HALT_OFFSET__", sizeof("__COMPILER_HALT_OFFSET__")) == 0) {`
	`482`	`+ if (memcmp(name, "\0__COMPILER_HALT_OFFSET__", sizeof("\0__COMPILER_HALT_OFFSET__")) == 0) {`
`483`	`483`	`name++;`
`484`	`484`	`}`
`485`	`485`	`zend_error(E_NOTICE,"Constant %s already defined", name);`