]> granicus.if.org Git - php/commitdiff
Commit previously missing patch for bug #41919
authorIlia Alshanetsky <iliaa@php.net>
Thu, 12 Jul 2007 23:33:50 +0000 (23:33 +0000)
committerIlia Alshanetsky <iliaa@php.net>
Thu, 12 Jul 2007 23:33:50 +0000 (23:33 +0000)
Zend/zend_execute.c

index 5ff01f510a4a1751d88a2729b37bbd1ec1144c44..c69dcd72b6a514dd45d4f75faf11d97f6d7fa581 100644 (file)
@@ -1235,7 +1235,12 @@ 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");
+               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;
        }
 
        container = *container_ptr;