From: Henrique do Nascimento Angelo <hnangelo@php.net>
Date: Sat, 28 Jun 2008 09:24:18 +0000 (+0000)
Subject: Fix a memory leak on openssl_decrypt()
X-Git-Tag: BEFORE_HEAD_NS_CHANGE~1451
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d44509418efa19d8c6ecf10def3e3eaf835e34b3;p=php

Fix a memory leak on openssl_decrypt()
---

diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index 920a5fc3c6..4f653921c1 100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -4691,10 +4691,9 @@ PHP_FUNCTION(openssl_decrypt)
 		return;
 	}
 
-	if (!raw_input) {
-		base64_str = (char*)php_base64_decode((unsigned char*)data, data_len, &base64_str_len);
-		data_len = base64_str_len;
-		data = base64_str;
+	if (!method_len) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown cipher algorithm");
+		RETURN_FALSE;
 	}
 
 	cipher_type = EVP_get_cipherbyname(method);
@@ -4703,6 +4702,12 @@ PHP_FUNCTION(openssl_decrypt)
 		RETURN_FALSE;
 	}
 
+	if (!raw_input) {
+		base64_str = (char*)php_base64_decode((unsigned char*)data, data_len, &base64_str_len);
+		data_len = base64_str_len;
+		data = base64_str;
+	}
+
 	keylen = EVP_CIPHER_key_length(cipher_type);
 	if (keylen > password_len) {
 		key = emalloc(keylen);