Skip to content

Commit 6a914cb

Browse files
committed
Fix GH-12791: Possible dereference of NULL in MySQLnd debug code
Closes GH-12794.
1 parent ebb4488 commit 6a914cb

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

NEWS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ PHP NEWS
2626

2727
- MySQLnd:
2828
. Avoid using uninitialised struct. (mikhainin)
29+
. Fixed bug GH-12791 (Possible dereference of NULL in MySQLnd debug code).
30+
(nielsdos)
2931

3032
- OpenSSL:
3133
. Fixed bug #50713 (openssl_pkcs7_verify() may ignore untrusted CAs).

ext/mysqlnd/mysqlnd_result.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -735,8 +735,8 @@ MYSQLND_METHOD(mysqlnd_res, store_result_fetch_data)(MYSQLND_CONN_DATA * const c
735735
UPSERT_STATUS_GET_SERVER_STATUS(conn->upsert_status));
736736
free_end:
737737
PACKET_FREE(&row_packet);
738+
DBG_INF_FMT("rows=%llu", (unsigned long long)set->row_count);
738739
end:
739-
DBG_INF_FMT("rows=%llu", (unsigned long long)result->stored_data->row_count);
740740
DBG_RETURN(ret);
741741
}
742742
/* }}} */

0 commit comments

Comments
 (0)