From a845e7bc087f18d16e13b226de5028aa65f801e3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Johannes=20Schl=C3=BCter?= Date: Tue, 6 Mar 2012 00:15:40 +0000 Subject: [PATCH] Fix bug #61003 mysql_stat() require a valid connection --- NEWS | 3 +++ ext/mysqli/mysqli_prop.c | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/NEWS b/NEWS index b0e9be5b05..168931cfef 100644 --- a/NEWS +++ b/NEWS @@ -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) diff --git a/ext/mysqli/mysqli_prop.c b/ext/mysqli/mysqli_prop.c index 7e1bc9f7ec..908de63d23 100644 --- a/ext/mysqli/mysqli_prop.c +++ b/ext/mysqli/mysqli_prop.c @@ -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; -- 2.40.0