Permalink
Browse files

Fixed Bug #62005 (unexpected behavior when incrementally assigning to…

… a member of a null object)
  • Loading branch information...
1 parent 950d5ee commit 3332943c9d20a8b5e09816b11f38742de0e16085 @laruence laruence committed May 12, 2012
Showing with 18 additions and 2 deletions.
  1. +2 −0 NEWS
  2. +15 −0 Zend/tests/bug62005.phpt
  3. +1 −2 Zend/zend_execute.c
View
@@ -11,6 +11,8 @@ PHP NEWS
(Laruence)
- Core:
+ . Fixed bug #62005 (unexpected behavior when incrementally assigning to a
+ member of a null object). (Laruence)
. Fixed bug #61730 (Segfault from array_walk modifying an array passed by
reference). (Laruence)
. Fixed missing bound check in iptcparse(). (chris at chiappa.net)
@@ -0,0 +1,15 @@
+--TEST--
+Bug #62005 (unexpected behavior when incrementally assigning to a member of a null object)
+--FILE--
+<?php
+function add_points($player, $points) {
+ $player->energy += $points;
+ print_r($player);
+}
+add_points(NULL, 2);
+--EXPECTF--
+Strict Standards: Creating default object from empty value in %sbug62005.php on line %d
+stdClass Object
+(
+ [energy] => 2
+)
View
@@ -432,11 +432,10 @@ static inline void make_real_object(zval **object_ptr TSRMLS_DC)
|| (Z_TYPE_PP(object_ptr) == IS_BOOL && Z_LVAL_PP(object_ptr) == 0)
|| (Z_TYPE_PP(object_ptr) == IS_STRING && Z_STRLEN_PP(object_ptr) == 0)
) {
- zend_error(E_STRICT, "Creating default object from empty value");
-
SEPARATE_ZVAL_IF_NOT_REF(object_ptr);
zval_dtor(*object_ptr);
object_init(*object_ptr);
+ zend_error(E_STRICT, "Creating default object from empty value");
}
}

0 comments on commit 3332943

Please sign in to comment.