[PHP-CVS] cvs: php-src /ext/mysqli mysqli.c /ext/mysqli/tests bug31141.phpt

[Georg Richter]

georg           Sat Dec 25 11:42:53 2004 EDT

  Added files:                 
    /php-src/ext/mysqli/tests   bug31141.phpt 

  Modified files:              
    /php-src/ext/mysqli mysqli.c 
  Log:
  fix for bug 31141
  
  
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli.c?r1=1.55&r2=1.56&ty=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.55 php-src/ext/mysqli/mysqli.c:1.56
--- php-src/ext/mysqli/mysqli.c:1.55    Thu Dec  9 03:22:06 2004
+++ php-src/ext/mysqli/mysqli.c Sat Dec 25 11:42:53 2004
@@ -15,7 +15,7 @@
   | Author: Georg Richter <[EMAIL PROTECTED]>                                |
   +----------------------------------------------------------------------+
 
-  $Id: mysqli.c,v 1.55 2004/12/09 08:22:06 tony2001 Exp $ 
+  $Id: mysqli.c,v 1.56 2004/12/25 16:42:53 georg Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -218,7 +218,6 @@
        } else {
                std_hnd = zend_get_std_object_handlers();
                retval = std_hnd->read_property(object, member, type TSRMLS_CC);
-               retval->refcount = 1;
        }
 
        if (member == &tmp_member) {
@@ -398,6 +397,8 @@
 PHP_MINIT_FUNCTION(mysqli)
 {
        zend_class_entry *ce;
+       zend_object_handlers *std_hnd = zend_get_std_object_handlers();
+
        
        ZEND_INIT_MODULE_GLOBALS(mysqli, php_mysqli_init_globals, NULL);
        REGISTER_INI_ENTRIES();
@@ -406,7 +407,7 @@
        mysqli_object_handlers.clone_obj = NULL;
        mysqli_object_handlers.read_property = mysqli_read_property;
        mysqli_object_handlers.write_property = mysqli_write_property;
-       mysqli_object_handlers.get_property_ptr_ptr = NULL;
+       mysqli_object_handlers.get_property_ptr_ptr = 
std_hnd->get_property_ptr_ptr;
        mysqli_object_handlers.get_constructor = php_mysqli_constructor_get;
 
        zend_hash_init(&classes, 0, NULL, NULL, 1);

http://cvs.php.net/co.php/php-src/ext/mysqli/tests/bug31141.phpt?r=1.1&p=1
Index: php-src/ext/mysqli/tests/bug31141.phpt
+++ php-src/ext/mysqli/tests/bug31141.phpt
--TEST--
Bug #31141 testcase (properties)
--SKIPIF--
<?php require_once('skipif.inc'); ?>
--FILE--
<?php
class Test extends mysqli
{
        public $test = array();

        function foo()
        {
                $ar_test = array("foo", "bar");
                $this->test = &$ar_test;
        }
}

$my_test = new Test;
$my_test->foo();
var_dump($my_test->test);
?>
--EXPECTF--
array(2) {
  [0]=>
  string(3) "foo"
  [1]=>
  string(3) "bar"
}

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