diff options
| author | Scott MacVicar <scottmac@php.net> | 2011-12-18 05:14:32 +0000 |
|---|---|---|
| committer | Scott MacVicar <scottmac@php.net> | 2011-12-18 05:14:32 +0000 |
| commit | beda5efd418b54965cb5756741903f8014ac4758 (patch) | |
| tree | 3eba6564d25f6aff069849371e8fd64f409587a9 | |
| parent | 3dc9f0abe67d0d34ba49202a8b8754293fec65af (diff) | |
| download | php-git-beda5efd418b54965cb5756741903f8014ac4758.tar.gz | |
Fix segfault in older versions of OpenSSL (before 0.9.8i)
| -rw-r--r-- | NEWS | 5 | ||||
| -rw-r--r-- | ext/openssl/openssl.c | 4 |
2 files changed, 8 insertions, 1 deletions
@@ -5,11 +5,16 @@ PHP NEWS . Added max_input_vars directive to prevent attacks based on hash collisions (Dmitry). . Fixed bug #60536 (Traits Segfault). (Laruence) + - CLI SAPI: . Fixed bug #60477 (Segfault after two multipart/form-data POST requests, one 200 RQ and one 404). (Laruence) . Fixed bug #60523 (PHP Errors are not reported in browsers using built-in SAPI). (Laruence, Derick) + +- OpenSSL: + . Fix segfault with older versions of OpenSSL. (Scott) + - Pdo Firebird: . Fixed bug #48877 ("bindValue" and "bindParam" do not work for PDO Firebird). (Mariuz) diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index 4f37f08f8e..749326ab27 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -4740,7 +4740,9 @@ PHP_FUNCTION(openssl_encrypt) if (options & OPENSSL_ZERO_PADDING) { EVP_CIPHER_CTX_set_padding(&cipher_ctx, 0); } - EVP_EncryptUpdate(&cipher_ctx, outbuf, &i, (unsigned char *)data, data_len); + if (data_len > 0) { + EVP_EncryptUpdate(&cipher_ctx, outbuf, &i, (unsigned char *)data, data_len); + } outlen = i; if (EVP_EncryptFinal(&cipher_ctx, (unsigned char *)outbuf + i, &i)) { outlen += i; |