Skip to content

Commit 3269aa9

Browse files
committed
Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2: Fix GH-12791: Possible dereference of NULL in MySQLnd debug code
2 parents 6eecb3e + 6a914cb commit 3269aa9

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
@@ -8,6 +8,8 @@ PHP NEWS
88

99
- MySQLnd:
1010
. Avoid using uninitialised struct. (mikhainin)
11+
. Fixed bug GH-12791 (Possible dereference of NULL in MySQLnd debug code).
12+
(nielsdos)
1113

1214
- Standard
1315
. Fixed GH-12745 (http_build_query() default null argument for $arg_separator

ext/mysqlnd/mysqlnd_result.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -733,8 +733,8 @@ MYSQLND_METHOD(mysqlnd_res, store_result_fetch_data)(MYSQLND_CONN_DATA * const c
733733
UPSERT_STATUS_GET_SERVER_STATUS(conn->upsert_status));
734734
free_end:
735735
PACKET_FREE(&row_packet);
736+
DBG_INF_FMT("rows=%llu", (unsigned long long)set->row_count);
736737
end:
737-
DBG_INF_FMT("rows=%llu", (unsigned long long)result->stored_data->row_count);
738738
DBG_RETURN(ret);
739739
}
740740
/* }}} */

0 commit comments

Comments
 (0)