diff options
| author | Marcus Boerger <helly@php.net> | 2004-01-07 00:24:58 +0000 |
|---|---|---|
| committer | Marcus Boerger <helly@php.net> | 2004-01-07 00:24:58 +0000 |
| commit | 1d2b4bcc48bb4de8be6eb67f41870df97e408c7d (patch) | |
| tree | b528dc0c4e6e82d29666e4e9301388732ead7b8f | |
| parent | 82f0c9e7aa79bc31cf96f23d87e7c0513748b1e2 (diff) | |
| download | php-git-1d2b4bcc48bb4de8be6eb67f41870df97e408c7d.tar.gz | |
Reimplement part of Bug #24608 that was reverted too
| -rw-r--r-- | Zend/zend_execute.c | 6 |
1 files changed, 5 insertions, 1 deletions
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; |