Merge branch 'PHP-7.3' into PHP-7.4

nikic · nikic · commit 37a179bd3cfd · 2020-04-03T10:06:09.000+02:00
* PHP-7.3:
  Fix incorrect free for last_message
diff --git a/ext/mysqlnd/mysqlnd_auth.c b/ext/mysqlnd/mysqlnd_auth.c
@@ -509,7 +509,7 @@ mysqlnd_auth_change_user(MYSQLND_CONN_DATA * const conn,
 		conn->password.s = tmp;
 
 		if (conn->last_message.s) {
-			mnd_pefree(conn->last_message.s, conn->persistent);
+			mnd_efree(conn->last_message.s);
 			conn->last_message.s = NULL;
 		}
 		UPSERT_STATUS_RESET(conn->upsert_status);

Original file line number	Diff line number	Diff line change
`@@ -509,7 +509,7 @@ mysqlnd_auth_change_user(MYSQLND_CONN_DATA * const conn,`
`509`	`509`	`conn->password.s = tmp;`
`510`	`510`
`511`	`511`	`if (conn->last_message.s) {`
`512`		`- mnd_pefree(conn->last_message.s, conn->persistent);`
	`512`	`+ mnd_efree(conn->last_message.s);`
`513`	`513`	`conn->last_message.s = NULL;`
`514`	`514`	`}`
`515`	`515`	`UPSERT_STATUS_RESET(conn->upsert_status);`