diff options
| author | Derick Rethans <github@derickrethans.nl> | 2019-06-21 16:50:40 +0100 |
|---|---|---|
| committer | Derick Rethans <github@derickrethans.nl> | 2019-06-21 16:51:52 +0100 |
| commit | 579562176b71820ad49d43b2c841642fef12fe57 (patch) | |
| tree | 5ae85c05b0119099b5b81f024a7eb42791ba861d /ext/mysqli/mysqli_prop.c | |
| parent | 152ccfb08dd766cdb76583b061dcc2c8a73a7255 (diff) | |
| download | php-git-579562176b71820ad49d43b2c841642fef12fe57.tar.gz | |
Fixed bug #67348: Reading $dbc->stat modifies $dbc->affected_rows
Diffstat (limited to 'ext/mysqli/mysqli_prop.c')
| -rw-r--r-- | ext/mysqli/mysqli_prop.c | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/ext/mysqli/mysqli_prop.c b/ext/mysqli/mysqli_prop.c index 25985927dc..eab1a0676c 100644 --- a/ext/mysqli/mysqli_prop.c +++ b/ext/mysqli/mysqli_prop.c @@ -234,38 +234,6 @@ MYSQLI_MAP_PROPERTY_FUNC_STRING(link_sqlstate_read, mysql_sqlstate, MYSQLI_GET_M MYSQLI_MAP_PROPERTY_FUNC_LONG(link_thread_id_read, mysql_thread_id, MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID), zend_ulong, ZEND_ULONG_FMT) MYSQLI_MAP_PROPERTY_FUNC_LONG(link_warning_count_read, mysql_warning_count, MYSQLI_GET_MYSQL(MYSQLI_STATUS_VALID), zend_ulong, ZEND_ULONG_FMT) -/* {{{ property link_stat_read */ -static zval *link_stat_read(mysqli_object *obj, zval *retval) -{ - MY_MYSQL *mysql; - - 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; - - if (mysql) { -#if defined(MYSQLI_USE_MYSQLND) - 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); - } -#endif - } - return retval; -} -/* }}} */ - /* result properties */ /* {{{ property result_type_read */ @@ -435,7 +403,6 @@ const mysqli_property_entry mysqli_link_property_entries[] = { {"insert_id", sizeof("insert_id") - 1, link_insert_id_read, NULL}, {"server_info", sizeof("server_info") - 1, link_server_info_read, NULL}, {"server_version", sizeof("server_version") - 1, link_server_version_read, NULL}, - {"stat", sizeof("stat") - 1, link_stat_read, NULL}, {"sqlstate", sizeof("sqlstate") - 1, link_sqlstate_read, NULL}, {"protocol_version",sizeof("protocol_version") - 1, link_protocol_version_read, NULL}, {"thread_id", sizeof("thread_id") - 1, link_thread_id_read, NULL}, |