Merge branch 'PHP-7.2'

dstogov · dstogov · commit 591f4f005d38 · 2018-06-14T02:41:14.000+03:00
* PHP-7.2: Fixed invalid free introduced by d6e81f0 (avoid keeping "invalid" pointer)
diff --git a/ext/mysqlnd/mysqlnd_connection.c b/ext/mysqlnd/mysqlnd_connection.c
@@ -672,6 +672,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, connect)(MYSQLND_CONN_DATA * conn,
 			conn->unix_socket.s = NULL;
 			goto err;
 		}
+		conn->unix_socket.s = NULL;
 	}
 
 	{

Original file line number	Diff line number	Diff line change
`@@ -672,6 +672,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, connect)(MYSQLND_CONN_DATA * conn,`
`672`	`672`	`conn->unix_socket.s = NULL;`
`673`	`673`	`goto err;`
`674`	`674`	`}`
	`675`	`+ conn->unix_socket.s = NULL;`
`675`	`676`	`}`
`676`	`677`
`677`	`678`	`{`