summaryrefslogtreecommitdiff
path: root/Zend/zend_execute.c
diff options
context:
space:
mode:
Diffstat (limited to 'Zend/zend_execute.c')
-rw-r--r--Zend/zend_execute.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index c5b502501e..6a6ad61094 100644
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -2872,6 +2872,10 @@ static zend_always_inline void zend_fetch_property_address(zval *result, zval *c
}
return;
}
+ if (UNEXPECTED(EG(exception))) {
+ ZVAL_ERROR(result);
+ return;
+ }
} else if (UNEXPECTED(Z_ISERROR_P(ptr))) {
ZVAL_ERROR(result);
return;