Fixed bug #64726 (Segfault when calling fetch_object on a use_result and DB pointer has closed)

13 years ago · 8f5a534b21
3 changed files with 6 additions and 2 deletions
--- a/4
+++ b/4
@ -17,6 +17,10 @@ PHP                                                                        NEWS
 - Fileinfo:
  . Upgraded libmagic to 5.14. (Anatol)

+- MySQLi:
+  . Fixed bug #64726 (Segfault when calling fetch_object on a use_result and DB
+    pointer has closed). (Laruence)
+
 - Zip:
  . Fixed bug #64342 (ZipArchive::addFile() has to check for file existence).
    (Anatol)
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@ -1257,7 +1257,7 @@ void php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAMETERS, int override_flags

 	php_mysqli_fetch_into_hash_aux(return_value, result, fetchtype TSRMLS_CC);

-	if (into_object && Z_TYPE_P(return_value) != IS_NULL) {
+	if (into_object && Z_TYPE_P(return_value) == IS_ARRAY) {
 		zval dataset = *return_value;
 		zend_fcall_info fci;
 		zend_fcall_info_cache fcc;
--- a/ext/mysqli/tests/bug64726.phpt
+++ b/ext/mysqli/tests/bug64726.phpt
@ -1,5 +1,5 @@
 --TEST--
-Bug #63398 (Memleak when calling fetch_object on a use_result and DB pointer has closed)
+Bug #63398 (Segfault when calling fetch_object on a use_result and DB pointer has closed)
 --SKIPIF--
 <?php
 require_once('skipif.inc');