diff options
Diffstat (limited to 'ext/mysqli')
| -rw-r--r-- | ext/mysqli/mysqli_api.c | 10 | ||||
| -rw-r--r-- | ext/mysqli/mysqli_prop.c | 9 |
2 files changed, 9 insertions, 10 deletions
diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c index 195eb41b5c..19f12417fe 100644 --- a/ext/mysqli/mysqli_api.c +++ b/ext/mysqli/mysqli_api.c @@ -2262,9 +2262,10 @@ PHP_FUNCTION(mysqli_stat) { MY_MYSQL *mysql; zval *mysql_link; - char *stat; #if defined(MYSQLI_USE_MYSQLND) - uint stat_len; + zend_string *stat; +#else + char *stat; #endif if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) { @@ -2277,10 +2278,9 @@ PHP_FUNCTION(mysqli_stat) { RETURN_STRING(stat); #else - if (mysqlnd_stat(mysql->mysql, &stat, &stat_len) == PASS) + if (mysqlnd_stat(mysql->mysql, &stat) == PASS) { - RETVAL_STRINGL(stat, stat_len); - efree(stat); + RETURN_STR(stat); #endif } else { RETURN_FALSE; diff --git a/ext/mysqli/mysqli_prop.c b/ext/mysqli/mysqli_prop.c index b772511647..cd0639d98f 100644 --- a/ext/mysqli/mysqli_prop.c +++ b/ext/mysqli/mysqli_prop.c @@ -250,14 +250,13 @@ static zval *link_stat_read(mysqli_object *obj, zval *retval TSRMLS_DC) mysql = (MY_MYSQL *)((MYSQLI_RESOURCE *)(obj->ptr))->ptr; if (mysql) { - char * stat_msg; #if defined(MYSQLI_USE_MYSQLND) - uint stat_msg_len; - if (mysqlnd_stat(mysql->mysql, &stat_msg, &stat_msg_len) == PASS) { - ZVAL_STRINGL(retval, stat_msg, stat_msg_len); - efree(stat_msg); + zend_string * stat_msg; + if (mysqlnd_stat(mysql->mysql, &stat_msg) == PASS) { + ZVAL_STR(retval, stat_msg); } #else + char * stat_msg; if ((stat_msg = (char *)mysql_stat(mysql->mysql))) { ZVAL_STRING(retval, stat_msg); } |