From f424fe8aeded4adb6b2af6a32d3aa19291162204 Mon Sep 17 00:00:00 2001 From: Scott MacVicar Date: Thu, 23 Feb 2012 01:26:46 +0000 Subject: [PATCH] Fixed bug #61124 (Crash when decoding an invalid base64 encoded string). --- ext/openssl/openssl.c | 4 ++++ 1 file changed, 4 insertions(+) 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; } -- 2.40.0