mirror of
https://github.com/php/php-src.git
synced 2025-08-16 05:58:45 +02:00
Don't assert mysql->mysql is non-null
There is an edge case in constructor behavior where we can end up with mysql->mysql being NULL (rather than mysql itself already being NULL). I think that ultimately that's a bug in the constructor code, and we should probably be destroying the outer structure on construction failure as well. However it's pretty hard to unravel with when considering all the construction permutations.
This commit is contained in:
parent
196671a2b2
commit
ce38d3a919
2 changed files with 26 additions and 1 deletions
|
@ -252,7 +252,10 @@ extern void php_mysqli_fetch_into_hash_aux(zval *return_value, MYSQL_RES * resul
|
||||||
#define MYSQLI_FETCH_RESOURCE_CONN(__ptr, __id, __check) \
|
#define MYSQLI_FETCH_RESOURCE_CONN(__ptr, __id, __check) \
|
||||||
{ \
|
{ \
|
||||||
MYSQLI_FETCH_RESOURCE((__ptr), MY_MYSQL *, (__id), "mysqli_link", (__check)); \
|
MYSQLI_FETCH_RESOURCE((__ptr), MY_MYSQL *, (__id), "mysqli_link", (__check)); \
|
||||||
ZEND_ASSERT((__ptr)->mysql && "Missing connection?"); \
|
if (!(__ptr)->mysql) { \
|
||||||
|
zend_throw_error(NULL, "%s object is not fully initialized", ZSTR_VAL(Z_OBJCE_P(__id)->name)); \
|
||||||
|
RETURN_THROWS(); \
|
||||||
|
} \
|
||||||
}
|
}
|
||||||
|
|
||||||
#define MYSQLI_FETCH_RESOURCE_STMT(__ptr, __id, __check) \
|
#define MYSQLI_FETCH_RESOURCE_STMT(__ptr, __id, __check) \
|
||||||
|
|
22
ext/mysqli/tests/mysqli_incomplete_initialization.phpt
Normal file
22
ext/mysqli/tests/mysqli_incomplete_initialization.phpt
Normal file
|
@ -0,0 +1,22 @@
|
||||||
|
--TEST--
|
||||||
|
Incomplete initialization edge case where mysql->mysql is NULL
|
||||||
|
--SKIPIF--
|
||||||
|
<?php
|
||||||
|
require_once('skipif.inc');
|
||||||
|
?>
|
||||||
|
--FILE--
|
||||||
|
<?php
|
||||||
|
|
||||||
|
$mysqli = new mysqli();
|
||||||
|
$mysqli->__construct(null);
|
||||||
|
$mysqli->close();
|
||||||
|
|
||||||
|
?>
|
||||||
|
--EXPECTF--
|
||||||
|
Warning: mysqli::__construct(): (HY000/2002): No such file or directory in %s on line %d
|
||||||
|
|
||||||
|
Fatal error: Uncaught Error: mysqli object is not fully initialized in %s:%d
|
||||||
|
Stack trace:
|
||||||
|
#0 %s(%d): mysqli->close()
|
||||||
|
#1 {main}
|
||||||
|
thrown in %s on line %d
|
Loading…
Add table
Add a link
Reference in a new issue