felipe                                   Wed, 29 Sep 2010 01:25:35 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=303839

Log:
- Fixed bug #52947 (segfault when ssl stream option capture_peer_cert_chain 
used)

Bug: http://bugs.php.net/52947 (Open) segfault when ssl stream option 
capture_peer_cert_chain used
      
Changed paths:
    U   php/php-src/branches/PHP_5_3/NEWS
    U   php/php-src/branches/PHP_5_3/ext/openssl/xp_ssl.c
    U   php/php-src/trunk/ext/openssl/xp_ssl.c

Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS   2010-09-29 00:55:43 UTC (rev 303838)
+++ php/php-src/branches/PHP_5_3/NEWS   2010-09-29 01:25:35 UTC (rev 303839)
@@ -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

Modified: php/php-src/branches/PHP_5_3/ext/openssl/xp_ssl.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/openssl/xp_ssl.c   2010-09-29 00:55:43 UTC 
(rev 303838)
+++ php/php-src/branches/PHP_5_3/ext/openssl/xp_ssl.c   2010-09-29 01:25:35 UTC 
(rev 303839)
@@ -502,7 +502,6 @@
                                                                                
zend_list_insert(mycert,
                                                                                
        php_openssl_get_x509_list_id()));
                                                                
add_next_index_zval(arr, zcert);
-                                                               
FREE_ZVAL(zcert);
                                                        }

                                                } else {

Modified: php/php-src/trunk/ext/openssl/xp_ssl.c
===================================================================
--- php/php-src/trunk/ext/openssl/xp_ssl.c      2010-09-29 00:55:43 UTC (rev 
303838)
+++ php/php-src/trunk/ext/openssl/xp_ssl.c      2010-09-29 01:25:35 UTC (rev 
303839)
@@ -502,7 +502,6 @@
                                                                                
zend_list_insert(mycert,
                                                                                
        php_openssl_get_x509_list_id() TSRMLS_CC));
                                                                
add_next_index_zval(arr, zcert);
-                                                               
FREE_ZVAL(zcert);
                                                        }

                                                } else {

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to