felipe                                   Fri, 12 Nov 2010 23:34:03 +0000

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

Log:
- Fixed bug #53136 (Invalid read on openssl_csr_new())

Bug: http://bugs.php.net/53136 (Open) Invalid read on openssl_csr_new()
      
Changed paths:
    U   php/php-src/branches/PHP_5_3/NEWS
    U   php/php-src/branches/PHP_5_3/ext/openssl/openssl.c
    U   php/php-src/trunk/ext/openssl/openssl.c

Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS   2010-11-12 23:32:28 UTC (rev 305302)
+++ php/php-src/branches/PHP_5_3/NEWS   2010-11-12 23:34:03 UTC (rev 305303)
@@ -81,6 +81,7 @@
 - Fixed bug #53144 (Segfault in SplObjectStorage::removeAll()). (Felipe)
 - Fixed bug #53141 (autoload misbehaves if called from closing session).
   (ladislav at marek dot su)
+- Fixed bug #53136 (Invalid read on openssl_csr_new()). (Felipe)
 - Fixed bug #53071 (SPLObjectStorage defeats gc_collect_cycles). (Gustavo)
 - Fixed bug #53006 (stream_get_contents has an unpredictable behavior when the
   underlying stream does not support seeking). (Gustavo)

Modified: php/php-src/branches/PHP_5_3/ext/openssl/openssl.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/openssl/openssl.c  2010-11-12 23:32:28 UTC 
(rev 305302)
+++ php/php-src/branches/PHP_5_3/ext/openssl/openssl.c  2010-11-12 23:34:03 UTC 
(rev 305303)
@@ -2117,7 +2117,8 @@
                if (attribs) {
                        zend_hash_internal_pointer_reset_ex(HASH_OF(attribs), 
&hpos);
                        while(zend_hash_get_current_data_ex(HASH_OF(attribs), 
(void**)&item, &hpos) == SUCCESS) {
-                               char * strindex; uint strindexlen;
+                               char *strindex = NULL;
+                               uint strindexlen;
                                ulong intindex;

                                zend_hash_get_current_key_ex(HASH_OF(attribs), 
&strindex, &strindexlen, &intindex, 0, &hpos);

Modified: php/php-src/trunk/ext/openssl/openssl.c
===================================================================
--- php/php-src/trunk/ext/openssl/openssl.c     2010-11-12 23:32:28 UTC (rev 
305302)
+++ php/php-src/trunk/ext/openssl/openssl.c     2010-11-12 23:34:03 UTC (rev 
305303)
@@ -2154,7 +2154,8 @@
                if (attribs) {
                        zend_hash_internal_pointer_reset_ex(HASH_OF(attribs), 
&hpos);
                        while(zend_hash_get_current_data_ex(HASH_OF(attribs), 
(void**)&item, &hpos) == SUCCESS) {
-                               char * strindex; uint strindexlen;
+                               char *strindex = NULL;
+                               uint strindexlen;
                                ulong intindex;

                                zend_hash_get_current_key_ex(HASH_OF(attribs), 
&strindex, &strindexlen, &intindex, 0, &hpos);

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

Reply via email to