php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.2' into PHP-8.3

Browse Source 
* PHP-8.2:
  Fix GH-12791: Possible dereference of NULL in MySQLnd debug code
This commit is contained in:
Niels Dossche
2023-11-27 14:02:19 +01:00
parent 6eecb3e7f5 6a914cb7a5
commit 3269aa95cb
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@@ -8,6 +8,8 @@ PHP NEWS
- MySQLnd:
. Avoid using uninitialised struct. (mikhainin)
. Fixed bug GH-12791 (Possible dereference of NULL in MySQLnd debug code).
(nielsdos)
- Standard
. Fixed GH-12745 (http_build_query() default null argument for $arg_separator

2
ext/mysqlnd/mysqlnd_result.c
View File

@@ -733,8 +733,8 @@ MYSQLND_METHOD(mysqlnd_res, store_result_fetch_data)(MYSQLND_CONN_DATA * const c
UPSERT_STATUS_GET_SERVER_STATUS(conn->upsert_status));
free_end:
PACKET_FREE(&row_packet);
DBG_INF_FMT("rows=%llu", (unsigned long long)set->row_count);
end:
DBG_INF_FMT("rows=%llu", (unsigned long long)result->stored_data->row_count);
DBG_RETURN(ret);
}
/* }}} */