diff options
| author | Andrey Hristov <andrey@php.net> | 2016-01-13 16:30:23 +0100 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2016-01-13 16:30:23 +0100 |
| commit | 4e8988b45af9036ffd0cc0b3f20ee67b257c9528 (patch) | |
| tree | 66573b94d06b4bb0caa2c89b58187d0311ecdeb8 /ext/mysqlnd/mysqlnd_structs.h | |
| parent | 8e5cf2e1864015a0cba4ae47774a059bbdb37edf (diff) | |
| download | php-git-4e8988b45af9036ffd0cc0b3f20ee67b257c9528.tar.gz | |
commit 597db443cd6ce76b0dce590b9f51b5d4d610325e
Author: John Bafford <john@bafford.com>
Date: Mon Jan 11 17:17:44 2016 -0500
MYSQLND_METHOD(mysqlnd_conn_data, get_scheme) should take socket_or_pipe by reference to allow modifications
Fixes a read-from-null crash in mnd_pestrdup when trying to duplicate the socket filename. (Fixes regression in e81ecc80c)
Diffstat (limited to 'ext/mysqlnd/mysqlnd_structs.h')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_structs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mysqlnd/mysqlnd_structs.h b/ext/mysqlnd/mysqlnd_structs.h index 5bbb718cdc..35a0f3b16c 100644 --- a/ext/mysqlnd/mysqlnd_structs.h +++ b/ext/mysqlnd/mysqlnd_structs.h @@ -474,7 +474,7 @@ typedef enum_func_status (*func_mysqlnd_conn_data__set_client_option_2d)(MYSQLND typedef size_t (*func_mysqlnd_conn_data__negotiate_client_api_capabilities)(MYSQLND_CONN_DATA * const conn, const size_t flags); typedef size_t (*func_mysqlnd_conn_data__get_client_api_capabilities)(const MYSQLND_CONN_DATA * const conn); -typedef MYSQLND_STRING (*func_mysqlnd_conn_data__get_scheme)(MYSQLND_CONN_DATA * conn, MYSQLND_CSTRING hostname, MYSQLND_CSTRING socket_or_pipe, unsigned int port, zend_bool * unix_socket, zend_bool * named_pipe); +typedef MYSQLND_STRING (*func_mysqlnd_conn_data__get_scheme)(MYSQLND_CONN_DATA * conn, MYSQLND_CSTRING hostname, MYSQLND_CSTRING *socket_or_pipe, unsigned int port, zend_bool * unix_socket, zend_bool * named_pipe); |