diff options
| author | Scott MacVicar <scottmac@php.net> | 2012-02-23 01:26:46 +0000 |
|---|---|---|
| committer | Scott MacVicar <scottmac@php.net> | 2012-02-23 01:26:46 +0000 |
| commit | f424fe8aeded4adb6b2af6a32d3aa19291162204 (patch) | |
| tree | f90f89c9ce69a4067a41d7cea700714f3da27eb1 /ext/openssl/openssl.c | |
| parent | 48a01d2b0087b9006d713d4e3df2aa6281d71ef0 (diff) | |
| download | php-git-f424fe8aeded4adb6b2af6a32d3aa19291162204.tar.gz | |
Fixed bug #61124 (Crash when decoding an invalid base64 encoded string).
Diffstat (limited to 'ext/openssl/openssl.c')
| -rw-r--r-- | ext/openssl/openssl.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index f117df6ba8..7c5afc55d7 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -4776,6 +4776,10 @@ PHP_FUNCTION(openssl_decrypt) if (!raw_input) { base64_str = (char*)php_base64_decode((unsigned char*)data, data_len, &base64_str_len); + if (!base64_str) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to base64 decode the input"); + RETURN_FALSE; + } data_len = base64_str_len; data = base64_str; } |