From: Marcus Boerger <helly@php.net>
Date: Wed, 7 Jan 2004 00:24:58 +0000 (+0000)
Subject: Reimplement part of Bug #24608 that was reverted too
X-Git-Tag: php_ibase_before_split~369
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1d2b4bcc48bb4de8be6eb67f41870df97e408c7d;p=php

Reimplement part of Bug #24608 that was reverted too
---

diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index f3acee7d1f..6b9ad7e771 100644
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -169,7 +169,11 @@ static inline void zend_fetch_property_address_inner(zval *object, znode *op2, z
 	}
 
 	if (Z_OBJ_HT_P(object)->get_property_ptr_ptr) {
-		T(result->u.var).var.ptr_ptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, prop_ptr TSRMLS_CC);
+		zval **ptr_ptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, prop_ptr TSRMLS_CC);
+		if(NULL == ptr_ptr) {
+			zend_error(E_ERROR, "Cannot access undefined property for object with overloaded property access");
+		}
+		T(result->u.var).var.ptr_ptr = ptr_ptr;
 	} else if (Z_OBJ_HT_P(object)->read_property) {
 		T(result->u.var).var.ptr = Z_OBJ_HT_P(object)->read_property(object, prop_ptr, 0 TSRMLS_CC);
 		T(result->u.var).var.ptr_ptr = &T(result->u.var).var.ptr;