Avoid using uninitialised struct

Mikhail Galanin · Mikhail Galanin · commit e312c65d46cd · 2023-09-29T11:33:56.000+01:00
diff --git a/ext/mysqlnd/mysqlnd_result.c b/ext/mysqlnd/mysqlnd_result.c
@@ -344,8 +344,8 @@ mysqlnd_query_read_result_set_header(MYSQLND_CONN_DATA * conn, MYSQLND_STMT * s)
 					}
 					MYSQLND_INC_CONN_STATISTIC(conn->stats, statistic);
 				}
+				PACKET_FREE(&fields_eof);
 			} while (0);
-			PACKET_FREE(&fields_eof);
 			break; /* switch break */
 		}
 	} while (0);
diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.h b/ext/mysqlnd/mysqlnd_wireprotocol.h
@@ -34,7 +34,7 @@ PHPAPI extern const char mysqlnd_read_body_name[];
 #define PACKET_FREE(packet) \
 	do { \
 		DBG_INF_FMT("PACKET_FREE(%p)", packet); \
-		if ((packet)->header.m->free_mem) { \
+		if ((packet)->header.m && (packet)->header.m->free_mem) { \
 			((packet)->header.m->free_mem((packet))); \
 		} \
 	} while (0);

Original file line number	Diff line number	Diff line change
`@@ -344,8 +344,8 @@ mysqlnd_query_read_result_set_header(MYSQLND_CONN_DATA * conn, MYSQLND_STMT * s)`
`344`	`344`	`}`
`345`	`345`	`MYSQLND_INC_CONN_STATISTIC(conn->stats, statistic);`
`346`	`346`	`}`
	`347`	`+ PACKET_FREE(&fields_eof);`
`347`	`348`	`} while (0);`
`348`		`- PACKET_FREE(&fields_eof);`
`349`	`349`	`break; /* switch break */`
`350`	`350`	`}`
`351`	`351`	`} while (0);`