Fix bug #61003 mysql_stat() require a valid connection

This commit is contained in:
Johannes Schlüter 2012-03-06 00:15:40 +00:00
parent 46608a073c
commit a845e7bc08
2 changed files with 7 additions and 0 deletions

3
NEWS
View file

@ -38,6 +38,9 @@ PHP NEWS
- mbstring:
. MFH mb_ereg_replace_callback() for security enhancements. (Rui)
- mysqli
. Fixed bug #61003 (mysql_stat() require a valid connection). (Johannes).
- mysqlnd
. Fixed bug #60948 (mysqlnd FTBFS when -Wformat-security is enabled).
(Johannes)

View file

@ -260,7 +260,11 @@ static int link_stat_read(mysqli_object *obj, zval **retval TSRMLS_DC)\
MAKE_STD_ZVAL(*retval);
ZVAL_NULL(*retval);
#if defined(MYSQLI_USE_MYSQLND)
CHECK_STATUS(MYSQLI_STATUS_INITIALIZED);
#else
CHECK_STATUS(MYSQLI_STATUS_VALID);
#endif
mysql = (MY_MYSQL *)((MYSQLI_RESOURCE *)(obj->ptr))->ptr;