svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/openssl/openssl.c trunk/ext/openssl/openssl.c
| From: | Pierre Joye | Date: | Mon, 21 Feb 2011 12:47:38 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/openssl/openssl.c trunk/ext/openssl/openssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-64584@lists.php.net to get a copy of this message | ||
pajoye Mon, 21 Feb 2011 12:47:38 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=308534
Log:
- fix bug #54061, memory leak in openssl_decrypt
Bug: http://bugs.php.net/54061 (unknown)
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 2011-02-21 10:19:38 UTC (rev 308533)
+++ php/php-src/branches/PHP_5_3/NEWS 2011-02-21 12:47:38 UTC (rev 308534)
@@ -8,8 +8,10 @@
- Exif extension:
. Fixed bug #54002 (crash on crafted tag, reported by Luca Carettoni). (Pierre)
(CVE-2011-0708)
+
- OpenSSL extension:
. Fixed bug #54060 (Memory leaks when openssl_encrypt). (Pierre)
+ . Fixed bug #54061 (Memory leaks when openssl_decrypt). (Pierre)
- SPL extension:
. Fixed memory leak in DirectoryIterator::getExtension() and
Modified: php/php-src/branches/PHP_5_3/ext/openssl/openssl.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/openssl/openssl.c 2011-02-21 10:19:38 UTC (rev 308533)
+++ php/php-src/branches/PHP_5_3/ext/openssl/openssl.c 2011-02-21 12:47:38 UTC (rev 308534)
@@ -4804,6 +4804,7 @@
if (base64_str) {
efree(base64_str);
}
+ EVP_CIPHER_CTX_cleanup(&cipher_ctx);
}
/* }}} */
Modified: php/php-src/trunk/ext/openssl/openssl.c
===================================================================
--- php/php-src/trunk/ext/openssl/openssl.c 2011-02-21 10:19:38 UTC (rev 308533)
+++ php/php-src/trunk/ext/openssl/openssl.c 2011-02-21 12:47:38 UTC (rev 308534)
@@ -4815,6 +4815,7 @@
if (base64_str) {
efree(base64_str);
}
+ EVP_CIPHER_CTX_cleanup(&cipher_ctx);
}
/* }}} */