cvs: ZendEngine2(PHP_5_2) / zend_execute.c /tests bug41919.phpt

dmitry Thu Jan 24 08:51:04 2008 UTC Modified files: (Branch: PHP_5_2) /ZendEngine2 zend_execute.c /ZendEngine2/tests bug41919.phpt Log: Fixed error message http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_execute.c?r1=1.716.2.12.2.25&r2=1.716.2.12.2.26&diff_format=u Index: ZendEngine2/zend_execute.c diff -u ZendEngine2/zend_execute.c:1.716.2.12.2.25 ZendEngine2/zend_execute.c:1.716.2.12.2.26 --- ZendEngine2/zend_execute.c:1.716.2.12.2.25 Mon Dec 31 07:20:02 2007 +++ ZendEngine2/zend_execute.c Thu Jan 24 08:51:04 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_execute.c,v 1.716.2.12.2.25 2007/12/31 07:20:02 sebastian Exp $ */ +/* $Id: zend_execute.c,v 1.716.2.12.2.26 2008/01/24 08:51:04 dmitry Exp $ */ #define ZEND_INTENSIVE_DEBUGGING 0 @@ -1234,12 +1234,7 @@ zval *container; if (!container_ptr) { - zend_error(E_WARNING, "Cannot use string offset as an array"); - if (result) { - result->var.ptr_ptr = &EG(error_zval_ptr); - PZVAL_LOCK(*result->var.ptr_ptr); - } - return; + zend_error_noreturn(E_ERROR, "Cannot use string offset as an object"); } container = *container_ptr; http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/bug41919.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u Index: ZendEngine2/tests/bug41919.phpt diff -u ZendEngine2/tests/bug41919.phpt:1.1.2.3 ZendEngine2/tests/bug41919.phpt:1.1.2.4 --- ZendEngine2/tests/bug41919.phpt:1.1.2.3 Thu Jul 12 23:34:32 2007 +++ ZendEngine2/tests/bug41919.phpt Thu Jan 24 08:51:04 2008 @@ -8,5 +8,4 @@ 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