MFH:- Fixed bug #38183 (disable_classes=Foobar causes disabled class to be called...

diff --git a/NEWS b/NEWS
index c24c4c2b26c18477b8c5f9caa956d9c181fb3085..95b4a328e60f884e6b21fc100b9d19ff37fc2f8b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -101,6 +101,8 @@ PHP                                                                        NEWS
 
 - Fixed memory leaks in openssl streams context options. (Pierre)
 - Fixed handling of extremely long paths inside tempnam() function. (Ilia)
+- Fixed bug #38183 (disable_classes=Foobar causes disabled class to be
+  called Foo). (Jani)
 - Fixed bug #38125 (undefined reference to spl_dual_it_free_storage). (Marcus)
 - Fixed bug #38086 (stream_copy_to_stream() returns 0 when maxlen is bigger 
   than the actual length). (Tony)

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 3d84ec8b343a9ae9188d1fffbc42190c5b7ea887..7a4b78bb203925d8a7eea0020b7e692bbfbe0457 100644 (file)
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -2104,6 +2104,7 @@ ZEND_API int zend_disable_class(char *class_name, uint class_name_length TSRMLS_
        }
        INIT_CLASS_ENTRY((*disabled_class), class_name, disabled_class_new);
        disabled_class->create_object = display_disabled_class;
+       disabled_class->name_length = class_name_length;
        zend_register_internal_class(disabled_class TSRMLS_CC);
        return 1;
 }