Fixed bug #78810

diff --git a/NEWS b/NEWS
index 740abaa4214b411d3e509d0bfe93be00c7fa3d9c..a767481238efef85ed816f97625155f12de38fb9 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,12 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+
+?? ??? ????, PHP 7.4.1
+
+- Core:
+  . Fixed bug #78810 (RW fetches do not throw "uninitialized property"
+    exception). (Nikita)
+
 ?? ??? ????, PHP 7.4.0RC6
 
 - Core:

diff --git a/Zend/tests/bug78810.phpt b/Zend/tests/bug78810.phpt
new file mode 100644 (file)
index 0000000..0fd56f0
--- /dev/null
+++ b/Zend/tests/bug78810.phpt
@@ -0,0 +1,25 @@
+--TEST--
+Bug #78810: RW fetches do not throw "uninitialized property" exception
+--FILE--
+<?php
+
+class Test {
+    public int $i;
+}
+
+$test = new Test;
+try {
+    $test->i++;
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
+try {
+    $test->i += 1;
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
+
+?>
+--EXPECT--
+Typed property Test::$i must not be accessed before initialization
+Typed property Test::$i must not be accessed before initialization

diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index 5ac64fffb19d7b5ffbe9826bca1df44f29d6465f..3a7b83ed63f422d7c18acf7a5b7bac8fb94453ab 100644 (file)
--- a/Zend/zend_object_handlers.c
+++ b/Zend/zend_object_handlers.c
@@ -1044,8 +1044,16 @@ ZEND_API zval *zend_std_get_property_ptr_ptr(zval *object, zval *member, int typ
                        if (EXPECTED(!zobj->ce->__get) ||
                            UNEXPECTED((*zend_get_property_guard(zobj, name)) & IN_GET)) {
                                if (UNEXPECTED(type == BP_VAR_RW || type == BP_VAR_R)) {
-                                       ZVAL_NULL(retval);
-                                       zend_error(E_NOTICE, "Undefined property: %s::$%s", ZSTR_VAL(zobj->ce->name), ZSTR_VAL(name));
+                                       if (UNEXPECTED(prop_info)) {
+                                               zend_throw_error(NULL,
+                                                       "Typed property %s::$%s must not be accessed before initialization",
+                                                       ZSTR_VAL(prop_info->ce->name),
+                                                       ZSTR_VAL(name));
+                                               retval = &EG(error_zval);
+                                       } else {
+                                               ZVAL_NULL(retval);
+                                               zend_error(E_NOTICE, "Undefined property: %s::$%s", ZSTR_VAL(zobj->ce->name), ZSTR_VAL(name));
+                                       }
                                }
                        } else {
                                /* we do have getter - fail and let it try again with usual get/set */