diff options
| -rw-r--r-- | Zend/tests/bug41919.phpt | 3 | ||||
| -rw-r--r-- | Zend/zend_execute.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Zend/tests/bug41919.phpt b/Zend/tests/bug41919.phpt index 127eb97bc1..3ba9ae0ec4 100644 --- a/Zend/tests/bug41919.phpt +++ b/Zend/tests/bug41919.phpt @@ -8,5 +8,4 @@ $foo[3]->bar[1] = "bang"; echo "ok\n"; ?> --EXPECTF-- -Warning: Cannot use string offset as an array in %s/bug41919.php on line %d -ok +Fatal error: Cannot use string offset as an object in %s/bug41919.php on line %d diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 6214837cd2..5ff01f510a 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -1234,6 +1234,10 @@ static void zend_fetch_property_address(temp_variable *result, zval **container_ { zval *container; + if (!container_ptr) { + zend_error_noreturn(E_ERROR, "Cannot use string offset as an object"); + } + container = *container_ptr; if (container == EG(error_zval_ptr)) { if (result) { |