summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Boerger <helly@php.net>2003-07-21 07:13:26 +0000
committerMarcus Boerger <helly@php.net>2003-07-21 07:13:26 +0000
commit98963e3c75dcdc03984c7c2dbcaa84be92a9f5a5 (patch)
tree3bef2f5a306fbf5a3b0d6f1f02b3592b6df7d964
parent0229aad04232dce0b5f8bb3b36bba1bf57999025 (diff)
downloadphp-git-98963e3c75dcdc03984c7c2dbcaa84be92a9f5a5.tar.gz
Go with a better fix for #24729
-rw-r--r--Zend/zend_execute.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index cf4da2a0a1..ec52b51b60 100644
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -2385,13 +2385,12 @@ int zend_fetch_class_handler(ZEND_OPCODE_HANDLER_ARGS)
class_name_strlen = class_name->value.str.len;
free_class_name = 1;
} else {
- class_name_strval = "";
class_name_strlen = 0;
}
}
if (!ce) {
- if (EX(opline)->op1.op_type == IS_UNUSED && class_name->value.str.val && class_name->value.str.len) {
+ if (EX(opline)->op1.op_type == IS_UNUSED && class_name_strlen) {
if (zend_lookup_class(class_name_strval, class_name_strlen, &pce TSRMLS_CC) == SUCCESS) {
ce = *pce;
}