Browse Source

Merge branch 'PHP-5.3' into PHP-5.4

pull/203/head
Xinchen Hui 13 years ago
parent
commit
4e561055a4
  1. 5
      ext/mysqli/mysqli_nonapi.c
  2. 26
      ext/mysqli/tests/bug62885.phpt

5
ext/mysqli/mysqli_nonapi.c

@ -781,6 +781,11 @@ PHP_FUNCTION(mysqli_poll)
RETURN_FALSE;
}
if (!r_array && !e_array) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "No stream arrays were passed");
RETURN_FALSE;
}
if (r_array != NULL) {
mysqlnd_zval_array_to_mysqlnd_array(r_array, &new_r_array TSRMLS_CC);
}

26
ext/mysqli/tests/bug62885.phpt

@ -0,0 +1,26 @@
--TEST--
Bug #62885 (mysqli_poll - Segmentation fault)
--SKIPIF--
<?php
require_once('skipif.inc');
require_once("connect.inc");
if (!$IS_MYSQLND) {
die("skip mysqlnd only test");
}
?>
--FILE--
<?php
error_reporting(E_ALL);
$tablica = array();
$test1 = mysqli_poll($test2, $test3, $tablica, null);
$test2 = array();
$test2 = array();
$test1 = mysqli_poll($test2, $test3, $tablica, null);
echo "okey";
?>
--EXPECTF--
Warning: mysqli_poll(): No stream arrays were passed in %sbug62885.php on line %d
Warning: mysqli_poll(): No stream arrays were passed in %sbug62885.php on line %d
okey
Loading…
Cancel
Save