MFH: Fix #46813 (class_exists doesn`t work with fully qualified namespace)

diff --git a/Zend/tests/bug46813.phpt b/Zend/tests/bug46813.phpt
new file mode 100644 (file)
index 0000000..91837db
--- /dev/null
+++ b/Zend/tests/bug46813.phpt
@@ -0,0 +1,24 @@
+--TEST--
+Bug #46813: class_exists doesn`t work with fully qualified namespace
+--FILE--
+<?php
+namespace test;
+{
+       class inner
+       {
+               
+       }
+}
+
+$inner = new \test\inner();
+
+echo "autoload == true:\n";
+var_dump(class_exists('\test\inner', true));
+echo "autoload == false:\n";
+var_dump(class_exists('\test\inner', true));
+?>
+--EXPECT--
+autoload == true:
+bool(true)
+autoload == false:
+bool(true)

diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index 0a936ed7f481131fd5681b2dd68e27211dfd23ba..3a35373f75a89c8fb9934d572a3c2434e0809381 100644 (file)
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -1157,10 +1157,21 @@ ZEND_FUNCTION(class_exists)
        }
 
        if (!autoload) {
+               char *name;
+               int len;
+
                lc_name = do_alloca(class_name_len + 1, use_heap);
                zend_str_tolower_copy(lc_name, class_name, class_name_len);
+
+               /* Ignore leading "\" */
+               name = lc_name;
+               len = class_name_len;
+               if (lc_name[0] == '\\') {
+                       name = &lc_name[1];
+                       len--;
+               }
        
-               found = zend_hash_find(EG(class_table), lc_name, class_name_len+1, (void **) &ce);
+               found = zend_hash_find(EG(class_table), name, len+1, (void **) &ce);
                free_alloca(lc_name, use_heap);
                RETURN_BOOL(found == SUCCESS && !((*ce)->ce_flags & ZEND_ACC_INTERFACE));
        }