diff options
| author | Xinchen Hui <laruence@php.net> | 2014-06-18 14:42:46 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2014-06-18 15:03:01 +0800 |
| commit | 83d450c78de128da32048ef369d9769fa73be9da (patch) | |
| tree | 9486f19bbf000e4bc1e29ae4ef6659eec8bcbaee /ext/mysqlnd/mysqlnd_net.c | |
| parent | 4c4dc8e2395598c6c1a3231ff9770dc1a8e381ea (diff) | |
| download | php-git-83d450c78de128da32048ef369d9769fa73be9da.tar.gz | |
Fixed segfault of stream handling
Diffstat (limited to 'ext/mysqlnd/mysqlnd_net.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_net.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/mysqlnd/mysqlnd_net.c b/ext/mysqlnd/mysqlnd_net.c index 4ec9aa4ee9..6ca44ccc46 100644 --- a/ext/mysqlnd/mysqlnd_net.c +++ b/ext/mysqlnd/mysqlnd_net.c @@ -200,7 +200,7 @@ MYSQLND_METHOD(mysqlnd_net, open_tcp_or_unix)(MYSQLND_NET * const net, const cha */ zend_resource *le; - if ((le = zend_hash_str_find(&EG(persistent_list), hashed_details, hashed_details_len))) { + if ((le = zend_hash_str_find_ptr(&EG(persistent_list), hashed_details, hashed_details_len))) { /* in_free will let streams code skip destructing - big HACK, but STREAMS suck big time regarding persistent streams. @@ -223,7 +223,7 @@ MYSQLND_METHOD(mysqlnd_net, open_tcp_or_unix)(MYSQLND_NET * const net, const cha unregistered yntil the script ends. So, we need to take care of that. */ net_stream->in_free = 1; - zend_hash_index_del(&EG(regular_list), net_stream->res->handle); /* ToDO: should it be res->handle, do streams register with addref ?*/ + //????zend_hash_index_del(&EG(regular_list), net_stream->res->handle); /* ToDO: should it be res->handle, do streams register with addref ?*/ net_stream->in_free = 0; DBG_RETURN(net_stream); |