Skip to content

Commit f8bfc0e

Browse files
committed
Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2: Avoid using uninitialised struct
2 parents 4774dc1 + ebb4488 commit f8bfc0e

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

Diff for: NEWS

+3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ PHP NEWS
66
. Fixed bug GH-12758 / GH-12768 (Invalid opline in OOM handlers within
77
ZEND_FUNC_GET_ARGS and ZEND_BIND_STATIC). (Florian Engelhardt)
88

9+
- MySQLnd:
10+
. Avoid using uninitialised struct. (mikhainin)
11+
912
- Standard
1013
. Fixed GH-12745 (http_build_query() default null argument for $arg_separator
1114
is implicitly coerced to string). (Girgias)

Diff for: ext/mysqlnd/mysqlnd_result.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -344,8 +344,8 @@ mysqlnd_query_read_result_set_header(MYSQLND_CONN_DATA * conn, MYSQLND_STMT * s)
344344
}
345345
MYSQLND_INC_CONN_STATISTIC(conn->stats, statistic);
346346
}
347+
PACKET_FREE(&fields_eof);
347348
} while (0);
348-
PACKET_FREE(&fields_eof);
349349
break; /* switch break */
350350
}
351351
} while (0);

0 commit comments

Comments
 (0)