diff options
| author | Xinchen Hui <laruence@php.net> | 2012-08-22 13:52:04 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2012-08-22 13:52:04 +0800 |
| commit | 2af7a76822147c11f44b6a907b393fbd6ad74167 (patch) | |
| tree | 7d4ca1a58e114ddb7e4a2137cf808c5da95bb59a /ext/mysqli/mysqli_nonapi.c | |
| parent | 8830cd5be433070bd7891af734de9c71ed9ebd92 (diff) | |
| parent | 4e561055a46fc68077300b8ec25490a198e82560 (diff) | |
| download | php-git-2af7a76822147c11f44b6a907b393fbd6ad74167.tar.gz | |
Merge branch 'PHP-5.4'
Diffstat (limited to 'ext/mysqli/mysqli_nonapi.c')
| -rw-r--r-- | ext/mysqli/mysqli_nonapi.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c index fee65ee290..5e9c01378a 100644 --- a/ext/mysqli/mysqli_nonapi.c +++ b/ext/mysqli/mysqli_nonapi.c @@ -778,6 +778,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); } |