Stas's patch on zend_execute.c (1.448 -> 1.449) resulted in a bug where

Andrei Zmievski · Andrei Zmievski · commit 1ad9bd68ff33 · 2003-04-01T21:02:02.000Z
the namespaced member accesses didn't work. This should hopefully
correct it.
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
@@ -2371,7 +2371,7 @@ int zend_fetch_class_handler(ZEND_OPCODE_HANDLER_ARGS)
 
 			if(retval == FAILURE) {
 				/* try namespace */
-				if(zend_hash_find(&EG(global_namespace_ptr)->class_table, class_name_strval, class_name_strlen+1, (void **)&pce) == SUCCESS && (*pce)->type != ZEND_USER_NAMESPACE && (*pce)->type != ZEND_INTERNAL_NAMESPACE) {
+				if(zend_hash_find(&EG(global_namespace_ptr)->class_table, class_name_strval, class_name_strlen+1, (void **)&pce) == SUCCESS && ((*pce)->type == ZEND_USER_NAMESPACE || (*pce)->type == ZEND_INTERNAL_NAMESPACE)) {
 					retval = SUCCESS;
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -2371,7 +2371,7 @@ int zend_fetch_class_handler(ZEND_OPCODE_HANDLER_ARGS)`
`2371`	`2371`
`2372`	`2372`	`if(retval == FAILURE) {`
`2373`	`2373`	`/* try namespace */`
`2374`		`- if(zend_hash_find(&EG(global_namespace_ptr)->class_table, class_name_strval, class_name_strlen+1, (void *)&pce) == SUCCESS && (pce)->type != ZEND_USER_NAMESPACE && (*pce)->type != ZEND_INTERNAL_NAMESPACE) {`
	`2374`	`+ if(zend_hash_find(&EG(global_namespace_ptr)->class_table, class_name_strval, class_name_strlen+1, (void *)&pce) == SUCCESS && ((pce)->type == ZEND_USER_NAMESPACE \|\| (*pce)->type == ZEND_INTERNAL_NAMESPACE)) {`
`2375`	`2375`	`retval = SUCCESS;`
`2376`	`2376`	`}`
`2377`	`2377`	`}`