diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2018-06-14 02:41:14 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2018-06-14 02:41:14 +0300 |
| commit | 591f4f005d38fd2b61cb3be7bb9e4d1e774c3705 (patch) | |
| tree | 5818e9dfe0f4420cb60b3ca1bb6a70a076f9ed56 | |
| parent | fcfa006a4e11a95fb0e717b97164dbd4e23297bf (diff) | |
| parent | dad8bd585104fd8b67e54a85a4af134b5261f351 (diff) | |
| download | php-git-591f4f005d38fd2b61cb3be7bb9e4d1e774c3705.tar.gz | |
Merge branch 'PHP-7.2'
* PHP-7.2:
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 2e63c4a3b4..780526b759 100644 --- 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; } { |