summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSterling Hughes <sterling@php.net>2003-06-30 19:52:47 +0000
committerSterling Hughes <sterling@php.net>2003-06-30 19:52:47 +0000
commit1d70191ab1db03236ca2e5b04fb2155cdc123a42 (patch)
tree8e5ccc46aed828bd885bc0d37c7e1b83867308e9
parent223584a1382277858fe29dcda4dca4d44b2c6f1f (diff)
downloadphp-git-1d70191ab1db03236ca2e5b04fb2155cdc123a42.tar.gz
move the check down a little so it catches all cases
-rw-r--r--Zend/zend_builtin_functions.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index ba53261077..e2fb5dd001 100644
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -616,13 +616,14 @@ static void is_a_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool only_subclass)
} else {
if (only_subclass) {
instance_ce = Z_OBJCE_PP(obj)->parent;
- if (!instance_ce) {
- RETURN_FALSE;
- }
} else {
instance_ce = Z_OBJCE_PP(obj);
}
+ if (!instance_ce) {
+ RETURN_FALSE;
+ }
+
if (instanceof_function(instance_ce, *ce TSRMLS_CC)) {
retval = 1;
} else {