Adjust for lazy proxies

Author: iluuu1994

Zend/tests/gh18845.phpt

@@ -17,11 +17,13 @@ var_dump($c->prop ?? 1);
 
 $r = new ReflectionClass(C::class);
 $c = $r->newLazyProxy(function () {
-    throw new Exception('Not reached');
+    $c = new C();
+    $c->prop = 2;
+    return $c;
 });
 var_dump($c->prop ?? 1);
 
 ?>
 --EXPECT--
 int(1)
-int(1)
+int(2)

Zend/zend_object_handlers.c

@@ -733,6 +733,8 @@ ZEND_API zval *zend_std_read_property(zend_object *zobj, zend_string *name, int
 	uintptr_t property_offset;
 	const zend_property_info *prop_info = NULL;
 	uint32_t *guard = NULL;
+	bool obj_needs_deref = false;
+	zend_object *prev_zobj;
 
 #if DEBUG_OBJECT_HANDLERS
 	fprintf(stderr, "Read object #%d property: %s\n", zobj->handle, ZSTR_VAL(name));
@@ -906,12 +908,8 @@ ZEND_API zval *zend_std_read_property(zend_object *zobj, zend_string *name, int
 				goto call_getter;
 			}
 
-			bool obj_is_freed = GC_REFCOUNT(zobj) == 1;
-			OBJ_RELEASE(zobj);
-			if (UNEXPECTED(obj_is_freed)) {
-				retval = &EG(uninitialized_zval);
-				goto exit;
-			}
+			obj_needs_deref = true;
+			prev_zobj = zobj;
 		} else if (zobj->ce->__get && !((*guard) & IN_GET)) {
 			goto call_getter_addref;
 		}
@@ -960,7 +958,7 @@ ZEND_API zval *zend_std_read_property(zend_object *zobj, zend_string *name, int
 			zobj = zend_lazy_object_init(zobj);
 			if (!zobj) {
 				retval = &EG(uninitialized_zval);
-				goto exit;
+				goto exit_slow;
 			}
 
 			if (UNEXPECTED(guard)) {
@@ -971,11 +969,12 @@ ZEND_API zval *zend_std_read_property(zend_object *zobj, zend_string *name, int
 					(*guard) |= guard_type;
 					retval = zend_std_read_property(zobj, name, type, cache_slot, rv);
 					(*guard) &= ~guard_type;
-					return retval;
+					goto exit_slow;
 				}
 			}
 
-			return zend_std_read_property(zobj, name, type, cache_slot, rv);
+			retval = zend_std_read_property(zobj, name, type, cache_slot, rv);
+			goto exit_slow;
 		}
 	}
 	if (type != BP_VAR_IS) {
@@ -987,6 +986,16 @@ ZEND_API zval *zend_std_read_property(zend_object *zobj, zend_string *name, int
 	}
 	retval = &EG(uninitialized_zval);
 
+exit_slow:
+	if (obj_needs_deref) {
+		/* Move value to rv in case zobj gets destroyed. */
+		if (retval != rv) {
+			ZVAL_COPY(rv, retval);
+			retval = rv;
+		}
+		OBJ_RELEASE(prev_zobj);
+	}
+
 exit:
 	return retval;
 }