diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2018-06-14 02:40:59 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2018-06-14 02:40:59 +0300 |
| commit | dad8bd585104fd8b67e54a85a4af134b5261f351 (patch) | |
| tree | d3978d95a6c37460b5c4a5332a2ea4ee4e36e7ae | |
| parent | d04a1e8d7001c857df84c66063d6b8d215cfae09 (diff) | |
| parent | 11507c0e1bfa17a96480f3648397f6975c31551e (diff) | |
| download | php-git-dad8bd585104fd8b67e54a85a4af134b5261f351.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed invalid free introduced by d6e81f0bfd0cb90586dd83d4fd47a4302605261a (avoid keeping "invalid" pointer)
| -rw-r--r-- | ext/mysqlnd/mysqlnd_connection.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/mysqlnd/mysqlnd_connection.c b/ext/mysqlnd/mysqlnd_connection.c index f53eca5336..1e0088b54f 100644 --- 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; } { |