com php-src: Fix #63486: ext/mysqli/php_mysqli_structs.h ext/mysqli/tests/bug63486.phpt
| From: | Stanislav Malyshev | Date: | Fri, 20 Feb 2015 12:38:35 +0000 |
| Subject: | com php-src: Fix #63486: ext/mysqli/php_mysqli_structs.h ext/mysqli/tests/bug63486.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-85379@lists.php.net to get a copy of this message | ||
Commit: f4c96ffcb565c1daa76aa58256e4df6f111f8803
Author: Julien Pauli <jpauli@php.net> Fri, 20 Feb 2015 13:38:35 +0100
Parents: 9fb48edf3c32914330b7a5081a34b4328bf6da68
Branches: PHP-5.5 PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f4c96ffcb565c1daa76aa58256e4df6f111f8803
Log:
Fix #63486
Bugs:
https://bugs.php.net/63486
Changed paths:
M ext/mysqli/php_mysqli_structs..h
A ext/mysqli/tests/bug63486.phpt
Diff:
diff --git a/ext/mysqli/php_mysqli_structs.h b/ext/mysqli/php_mysqli_structs.h
index ce480d8..52da163 100644
--- a/ext/mysqli/php_mysqli_structs.h
+++ b/ext/mysqli/php_mysqli_structs.h
@@ -313,6 +313,7 @@ extern PHPAPI zend_class_entry *spl_ce_RuntimeException;
mysqli_object *intern = (mysqli_object *)zend_object_store_get_object(*(__id) TSRMLS_CC);\
efree(intern->ptr); \
intern->ptr = NULL; \
+ ZVAL_NULL(*__id); \
}
diff --git a/ext/mysqli/tests/bug63486.phpt b/ext/mysqli/tests/bug63486.phpt
new file mode 100644
index 0000000..72b8663
--- /dev/null
+++ b/ext/mysqli/tests/bug63486.phpt
@@ -0,0 +1,55 @@
+--TEST--
+mysqli_free_resource() - resets the zval to NULL
+--SKIPIF--
+<?php
+ require_once('skipif.inc');
+ require_once('skipifemb.inc');
+ require_once('skipifconnectfailure.inc');
+?>
+--FILE--
+<?php
+ require('connect.inc');
+ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
+ printf("[001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
+ die();
+ }
+
+ if (!($res = mysqli_query($link, "SELECT 1"))) {
+ printf("[002] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+ die();
+ }
+
+ $row = mysqli_fetch_row($res);
+ var_dump($row);
+ var_dump($res);
+
+ mysqli_free_result($res);
+
+ var_dump($row);
+ var_dump($res);
+?>
+--EXPECTF--
+array(1) {
+ [0]=>
+ string(1) "1"
+}
+object(mysqli_result)#3 (5) {
+ ["current_field"]=>
+ int(0)
+ ["field_count"]=>
+ int(1)
+ ["lengths"]=>
+ array(1) {
+ [0]=>
+ int(1)
+ }
+ ["num_rows"]=>
+ int(1)
+ ["type"]=>
+ int(0)
+}
+array(1) {
+ [0]=>
+ string(1) "1"
+}
+NULL