]> granicus.if.org Git - php/commitdiff
Fix leak on consteval exception in ReflectionClass::__toString()
authorNikita Popov <nikita.ppv@gmail.com>
Mon, 31 Aug 2020 13:10:09 +0000 (15:10 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Mon, 31 Aug 2020 13:10:09 +0000 (15:10 +0200)
ext/reflection/php_reflection.c
ext/reflection/tests/ReflectionClass_toString_004.phpt [new file with mode: 0644]

index df00e5b4ba24a64a1579fc7e167c2c031d3d1931..620d95afa49e8441f52fb74f78cde81c58c3983a 100644 (file)
@@ -373,6 +373,7 @@ static void _class_string(smart_str *str, zend_class_entry *ce, zval *obj, char
                ZEND_HASH_FOREACH_STR_KEY_PTR(&ce->constants_table, key, c) {
                        _class_const_string(str, ZSTR_VAL(key), c, ZSTR_VAL(sub_indent));
                        if (UNEXPECTED(EG(exception))) {
+                               zend_string_release(sub_indent);
                                return;
                        }
                } ZEND_HASH_FOREACH_END();
diff --git a/ext/reflection/tests/ReflectionClass_toString_004.phpt b/ext/reflection/tests/ReflectionClass_toString_004.phpt
new file mode 100644 (file)
index 0000000..04b42d0
--- /dev/null
@@ -0,0 +1,17 @@
+--TEST--
+Constant evaluation exception during ReflectionClass::__toString()
+--FILE--
+<?php
+
+class A {
+    const C = self::UNKNOWN;
+}
+try {
+    echo new ReflectionClass(A::class);
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
+
+?>
+--EXPECT--
+Undefined class constant 'self::UNKNOWN'