Commit:    33b104c778c5c0e5446671397aaddd66efa4a7bc
Author:    Stanislav Malyshev <s...@php.net>         Mon, 14 Jan 2013 00:06:09 
-0800
Parents:   f63a9f6c11c05aa76158b6cae0e05340d303a6af
Branches:  PHP-5.3 PHP-5.4 PHP-5.5 master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=33b104c778c5c0e5446671397aaddd66efa4a7bc

Log:
fix bug #63462 (Magic methods called twice for unset protected properties)

Bugs:
https://bugs.php.net/63462

Changed paths:
  M  NEWS
  A  Zend/tests/bug63462.phpt
  M  Zend/zend_object_handlers.c


Diff:
diff --git a/NEWS b/NEWS
index 928d829..d753d28 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,8 @@ PHP                                                             
           NEWS
   . Fixed bug #63899 (Use after scope error in zend_compile). (Laruence)
   . Fixed bug #63762 (Sigsegv when Exception::$trace is changed by user).
     (Johannes)
+  . Fixed bug #63462 (Magic methods called twice for unset protected 
+    properties). (Stas)
 
 - Core
   . Fixed bug #63943 (Bad warning text from strpos() on empty needle).
diff --git a/Zend/tests/bug63462.phpt b/Zend/tests/bug63462.phpt
new file mode 100644
index 0000000..e936a6f
--- /dev/null
+++ b/Zend/tests/bug63462.phpt
@@ -0,0 +1,74 @@
+--TEST--
+Test script to verify that magic methods should be called only once when 
accessing an unset property.
+--CREDITS--
+Marco Pivetta <ocram...@gmail.com>
+--FILE--
+<?php
+class Test {
+       public    $publicProperty;
+       protected $protectedProperty;
+       private   $privateProperty;
+
+       public function __construct() {
+               unset(
+                       $this->publicProperty, 
+                       $this->protectedProperty, 
+                       $this->privateProperty
+               );
+       }
+
+       function __get($name) {
+               echo '__get ' . $name . "\n";
+               return $this->$name;
+       }
+
+       function __set($name, $value) {
+               echo '__set ' . $name . "\n";
+               $this->$name = $value;
+       }
+
+       function __isset($name) {
+               echo '__isset ' . $name . "\n";
+               return isset($this->$name);
+       }
+}
+
+$test = new Test();
+
+$test->nonExisting;
+$test->publicProperty;
+$test->protectedProperty;
+$test->privateProperty;
+isset($test->nonExisting);
+isset($test->publicProperty);
+isset($test->protectedProperty);
+isset($test->privateProperty);
+$test->nonExisting       = 'value';
+$test->publicProperty   = 'value';
+$test->protectedProperty = 'value';
+$test->privateProperty   = 'value';
+
+?>
+
+--EXPECTF--
+__get nonExisting
+
+Notice: Undefined property: Test::$nonExisting in %s on line %d
+__get publicProperty
+
+Notice: Undefined property: Test::$publicProperty in %s on line %d
+__get protectedProperty
+
+Notice: Undefined property: Test::$protectedProperty in %s on line %d
+__get privateProperty
+
+Notice: Undefined property: Test::$privateProperty in %s on line %d
+__isset nonExisting
+__isset publicProperty
+__isset protectedProperty
+__isset privateProperty
+__set nonExisting
+__set publicProperty
+__set protectedProperty
+__set privateProperty
+
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index cbd64c9..a42669f 100644
--- a/Zend/zend_object_handlers.c
+++ b/Zend/zend_object_handlers.c
@@ -296,6 +296,16 @@ static int zend_get_property_guard(zend_object *zobj, 
zend_property_info *proper
                info.name = Z_STRVAL_P(member);
                info.name_length = Z_STRLEN_P(member);
                info.h = zend_get_hash_value(Z_STRVAL_P(member), 
Z_STRLEN_P(member) + 1);
+       } else if(property_info->name[0] == '\0'){
+               const char *class_name = NULL, *prop_name = NULL;
+               zend_unmangle_property_name(property_info->name, 
property_info->name_length, &class_name, &prop_name);
+               if(class_name) {
+                       /* use unmangled name for protected properties */
+                       info.name = prop_name;
+                       info.name_length = strlen(prop_name);
+                       info.h = zend_get_hash_value(info.name, 
info.name_length+1);
+                       property_info = &info;
+               }
        }
        if (!zobj->guards) {
                ALLOC_HASHTABLE(zobj->guards);


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to