diff options
| author | Johannes Schlüter <johannes@php.net> | 2012-03-06 00:15:40 +0000 |
|---|---|---|
| committer | Johannes Schlüter <johannes@php.net> | 2012-03-06 00:15:40 +0000 |
| commit | a845e7bc087f18d16e13b226de5028aa65f801e3 (patch) | |
| tree | 87f6e064706a7475695579448e93a23dc9480fb4 | |
| parent | 46608a073c31d9bf2c7fdd8cd746851fb6e840e8 (diff) | |
| download | php-git-a845e7bc087f18d16e13b226de5028aa65f801e3.tar.gz | |
Fix bug #61003 mysql_stat() require a valid connection
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | ext/mysqli/mysqli_prop.c | 4 |
2 files changed, 7 insertions, 0 deletions
@@ -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; |