diff options
| author | Pierrick Charron <pierrick@php.net> | 2010-01-03 16:59:33 +0000 |
|---|---|---|
| committer | Pierrick Charron <pierrick@php.net> | 2010-01-03 16:59:33 +0000 |
| commit | 614fd65795468be21901581e2962510620fcf5b4 (patch) | |
| tree | 259ff2d13bd17724bbd2359507ce332a13116be4 | |
| parent | 9ba1e81665df38fec244c926b3eff78034baa35a (diff) | |
| download | php-git-614fd65795468be21901581e2962510620fcf5b4.tar.gz | |
Fixed bug #50636 (MySQLi_Result sets values before calling constructor)
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | ext/mysqli/mysqli.c | 3 | ||||
| -rw-r--r-- | ext/mysqli/tests/bug50636.phpt | 35 |
3 files changed, 39 insertions, 1 deletions
@@ -7,6 +7,8 @@ PHP NEWS (Ilia) - Added stream_resolve_include_path(). (Mikko) +- Fixed bug #50636 (MySQLi_Result sets values before calling constructor). + (Pierrick) - Fixed bug #48190 (Content-type parameter "boundary" is not case-insensitive in HTTP uploads). (Ilia) - Fixed bug #47409 (extract() problem with array containing word "this"). diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c index 80e3759640..f5b7b96487 100644 --- a/ext/mysqli/mysqli.c +++ b/ext/mysqli/mysqli.c @@ -1205,7 +1205,6 @@ void php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAMETERS, int override_flags zval *retval_ptr; object_and_properties_init(return_value, ce, NULL); - zend_merge_properties(return_value, Z_ARRVAL(dataset), 1 TSRMLS_CC); if (ce->constructor) { fci.size = sizeof(fci); @@ -1261,6 +1260,8 @@ void php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAMETERS, int override_flags } else if (ctor_params) { zend_throw_exception_ex(zend_exception_get_default(TSRMLS_C), 0 TSRMLS_CC, "Class %s does not have a constructor hence you cannot use ctor_params", ce->name); } + + zend_merge_properties(return_value, Z_ARRVAL(dataset), 1 TSRMLS_CC); } } /* }}} */ diff --git a/ext/mysqli/tests/bug50636.phpt b/ext/mysqli/tests/bug50636.phpt new file mode 100644 index 0000000000..47f27721e4 --- /dev/null +++ b/ext/mysqli/tests/bug50636.phpt @@ -0,0 +1,35 @@ +--TEST-- +Bug #50636 (MySQLi_Result sets values before calling constructor) +--SKIPIF-- +<?php +require_once('skipif.inc'); +require_once('skipifconnectfailure.inc'); +?> +--FILE-- +<?php + include ("connect.inc"); + + class Book { + private $title = 0; + + function __construct() { + $this->title = 'foobar'; + } + + function __set($name, $value) { + $this->{$name} = $value; + } + } + + $link = new mysqli($host, $user, $passwd); + var_dump($link->query('SELECT "PHP" AS title, "Rasmus" AS author')->fetch_object('Book')); + echo "done!"; +?> +--EXPECTF-- +object(Book)#%d (2) { + ["title":"Book":private]=> + string(3) "PHP" + ["author"]=> + string(6) "Rasmus" +} +done! |