mirror of
https://github.com/php/php-src.git
synced 2024-10-02 15:26:06 +00:00
Merge branch 'PHP-5.5'
This commit is contained in:
commit
d173909e88
@ -680,7 +680,7 @@ static int mysqlnd_zval_array_from_mysqlnd_array(MYSQLND **in_array, zval *out_a
|
|||||||
MYSQLND **p = in_array;
|
MYSQLND **p = in_array;
|
||||||
HashTable *new_hash;
|
HashTable *new_hash;
|
||||||
zval **elem, **dest_elem;
|
zval **elem, **dest_elem;
|
||||||
int ret = 0;
|
int ret = 0, i = 0;
|
||||||
|
|
||||||
ALLOC_HASHTABLE(new_hash);
|
ALLOC_HASHTABLE(new_hash);
|
||||||
zend_hash_init(new_hash, zend_hash_num_elements(Z_ARRVAL_P(out_array)), NULL, ZVAL_PTR_DTOR, 0);
|
zend_hash_init(new_hash, zend_hash_num_elements(Z_ARRVAL_P(out_array)), NULL, ZVAL_PTR_DTOR, 0);
|
||||||
@ -689,13 +689,19 @@ static int mysqlnd_zval_array_from_mysqlnd_array(MYSQLND **in_array, zval *out_a
|
|||||||
zend_hash_get_current_data(Z_ARRVAL_P(out_array), (void **) &elem) == SUCCESS;
|
zend_hash_get_current_data(Z_ARRVAL_P(out_array), (void **) &elem) == SUCCESS;
|
||||||
zend_hash_move_forward(Z_ARRVAL_P(out_array)))
|
zend_hash_move_forward(Z_ARRVAL_P(out_array)))
|
||||||
{
|
{
|
||||||
|
i++;
|
||||||
if (Z_TYPE_PP(elem) != IS_OBJECT || !instanceof_function(Z_OBJCE_PP(elem), mysqli_link_class_entry TSRMLS_CC)) {
|
if (Z_TYPE_PP(elem) != IS_OBJECT || !instanceof_function(Z_OBJCE_PP(elem), mysqli_link_class_entry TSRMLS_CC)) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
MY_MYSQL *mysql;
|
MY_MYSQL *mysql;
|
||||||
|
MYSQLI_RESOURCE *my_res;
|
||||||
mysqli_object *intern = (mysqli_object *)zend_object_store_get_object(*elem TSRMLS_CC);
|
mysqli_object *intern = (mysqli_object *)zend_object_store_get_object(*elem TSRMLS_CC);
|
||||||
mysql = (MY_MYSQL *) ((MYSQLI_RESOURCE *)intern->ptr)->ptr;
|
if (!(my_res = (MYSQLI_RESOURCE *)intern->ptr)) {
|
||||||
|
php_error_docref(NULL TSRMLS_CC, E_WARNING, "[%d] Couldn't fetch %s", i, intern->zo.ce->name);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
mysql = (MY_MYSQL *) my_res->ptr;
|
||||||
if (mysql->mysql == *p) {
|
if (mysql->mysql == *p) {
|
||||||
zend_hash_next_index_insert(new_hash, (void *)elem, sizeof(zval *), (void **)&dest_elem);
|
zend_hash_next_index_insert(new_hash, (void *)elem, sizeof(zval *), (void **)&dest_elem);
|
||||||
if (dest_elem) {
|
if (dest_elem) {
|
||||||
|
34
ext/mysqli/tests/bug63398.phpt
Normal file
34
ext/mysqli/tests/bug63398.phpt
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
--TEST--
|
||||||
|
Bug #63398 (Segfault when polling closed link)
|
||||||
|
--SKIPIF--
|
||||||
|
<?php
|
||||||
|
require_once('skipif.inc');
|
||||||
|
require_once("connect.inc");
|
||||||
|
if (!$IS_MYSQLND) {
|
||||||
|
die("skip mysqlnd only test");
|
||||||
|
}
|
||||||
|
?>
|
||||||
|
--FILE--
|
||||||
|
<?php
|
||||||
|
$link = new mysqli('localhost', 'test', NULL, 'test');
|
||||||
|
|
||||||
|
mysqli_close($link);
|
||||||
|
|
||||||
|
$read = $error = $reject = array();
|
||||||
|
$read[] = $error[] = $reject[] = $link;
|
||||||
|
|
||||||
|
mysqli_poll($read, $error, $reject, 1);
|
||||||
|
|
||||||
|
echo "okey";
|
||||||
|
?>
|
||||||
|
--EXPECTF--
|
||||||
|
Warning: mysqli_poll(): [1] Couldn't fetch mysqli in %sbug63398.php on line %d
|
||||||
|
|
||||||
|
Warning: mysqli_poll(): [1] Couldn't fetch mysqli in %sbug63398.php on line %d
|
||||||
|
|
||||||
|
Warning: mysqli_poll(): No stream arrays were passed in %sbug63398.php on line %d
|
||||||
|
|
||||||
|
Warning: mysqli_poll(): [1] Couldn't fetch mysqli in %sbug63398.php on line %d
|
||||||
|
|
||||||
|
Warning: mysqli_poll(): [1] Couldn't fetch mysqli in %sbug63398.php on line %d
|
||||||
|
okey
|
Loading…
Reference in New Issue
Block a user