Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed invalid free introduced by d6e81f0bfd (avoid keeping "invalid" pointer)
This commit is contained in:
Dmitry Stogov 2018-06-14 02:40:59 +03:00
commit dad8bd5851

View file

@ -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;
}
{