diff options
| author | Sergei Morozov <morozov@tut.by> | 2017-10-29 12:16:56 -0700 |
|---|---|---|
| committer | Sara Golemon <pollita@php.net> | 2018-02-10 10:40:47 -0500 |
| commit | 1c393e95025347eaa688c38f723308031c028559 (patch) | |
| tree | 2b9ceeca273ba67435868ca432f68fa5aa560b7d /ext/mysqli/php_mysqli_structs.h | |
| parent | 70fec8a1cc0efbc36e4d302d280f2f08ab05bab6 (diff) | |
| download | php-git-1c393e95025347eaa688c38f723308031c028559.tar.gz | |
[Bug 75448] In case of failure, mysqli::prepare() returns NULL instead of FALSE
Diffstat (limited to 'ext/mysqli/php_mysqli_structs.h')
| -rw-r--r-- | ext/mysqli/php_mysqli_structs.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/mysqli/php_mysqli_structs.h b/ext/mysqli/php_mysqli_structs.h index 3a96ccbe79..e788796f1c 100644 --- a/ext/mysqli/php_mysqli_structs.h +++ b/ext/mysqli/php_mysqli_structs.h @@ -256,12 +256,12 @@ extern void php_mysqli_fetch_into_hash_aux(zval *return_value, MYSQL_RES * resul mysqli_object *intern = Z_MYSQLI_P(__id); \ if (!(my_res = (MYSQLI_RESOURCE *)intern->ptr)) {\ php_error_docref(NULL, E_WARNING, "Couldn't fetch %s", ZSTR_VAL(intern->zo.ce->name));\ - RETURN_NULL();\ + RETURN_FALSE;\ }\ __ptr = (__type)my_res->ptr; \ if (__check && my_res->status < __check) { \ php_error_docref(NULL, E_WARNING, "invalid object or resource %s\n", ZSTR_VAL(intern->zo.ce->name)); \ - RETURN_NULL();\ + RETURN_FALSE;\ }\ } |