Fixed bug #50636 (MySQLi_Result sets values before calling constructor)

NEWS

@@ -11,6 +11,8 @@ PHP                                                                        NEWS
 
 - Fixed build of mysqli with MySQL 5.5.0-m2. (Andrey)
 
+- Fixed bug #50636 (MySQLi_Result sets values before calling constructor).
+  (Pierrick)
 - Fixed bug #50575 (PDO_PGSQL LOBs are not compatible with PostgreSQL 8.5).
   (Matteo)
 - Fixed bug #50558 (Broken object model when extending tidy). (Pierrick)

ext/mysqli/mysqli.c

@@ -936,7 +936,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);
@@ -991,6 +990,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);
 	}
 }
 /* }}} */

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:private"]=>
+  string(3) "PHP"
+  ["author"]=>
+  string(6) "Rasmus"
+}
+done!