summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelipe Pena <felipe@php.net>2010-09-29 01:25:35 +0000
committerFelipe Pena <felipe@php.net>2010-09-29 01:25:35 +0000
commita5459c09c99c9e4e7bd3e15108f8c20832716620 (patch)
tree892e260499b27957991add4f258b278c4210e43b
parent22d73027d01a34a41eb0a39eacc9b90c0f5ae30c (diff)
downloadphp-git-a5459c09c99c9e4e7bd3e15108f8c20832716620.tar.gz
- Fixed bug #52947 (segfault when ssl stream option capture_peer_cert_chain used)
-rw-r--r--NEWS2
-rw-r--r--ext/openssl/xp_ssl.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index c74002110b..0f968246e0 100644
--- a/NEWS
+++ b/NEWS
@@ -22,6 +22,8 @@
- Fixed possible crash in mssql_fetch_batch(). (Kalle)
- Fixed inconsistent backlog default value (-1) in FPM on many systems. (fat)
+- Fixed bug #52947 (segfault when ssl stream option capture_peer_cert_chain
+ used). (Felipe)
- Fixed bug #52931 (strripos not overloaded with function overloading enabled).
(Felipe)
- Fixed bug #52929 (Segfault in filter_var with FILTER_VALIDATE_EMAIL with
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
index 412a445d11..930aa1f430 100644
--- a/ext/openssl/xp_ssl.c
+++ b/ext/openssl/xp_ssl.c
@@ -502,7 +502,6 @@ static inline int php_openssl_enable_crypto(php_stream *stream,
zend_list_insert(mycert,
php_openssl_get_x509_list_id()));
add_next_index_zval(arr, zcert);
- FREE_ZVAL(zcert);
}
} else {