Merge branch 'PHP-7.1' into PHP-7.2

dstogov · dstogov · commit dad8bd585104 · 2018-06-14T02:40:59.000+03:00
* PHP-7.1: Fixed invalid free introduced by d6e81f0 (avoid keeping "invalid" pointer)
diff --git a/ext/mysqlnd/mysqlnd_connection.c b/ext/mysqlnd/mysqlnd_connection.c
@@ -684,6 +684,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
`@@ -684,6 +684,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, connect)(MYSQLND_CONN_DATA * conn,`
`684`	`684`	`conn->unix_socket.s = NULL;`
`685`	`685`	`goto err;`
`686`	`686`	`}`
	`687`	`+ conn->unix_socket.s = NULL;`
`687`	`688`	`}`
`688`	`689`
`689`	`690`	`{`