From c35453897494d2b488961f7a446b4df8e24c6f31 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Sun, 15 Jun 2014 22:21:10 +0200
Subject: Update OpenSSL to 1.0.1h

---
 main/openssl/crypto/evp/encode.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'main/openssl/crypto/evp/encode.c')

diff --git a/main/openssl/crypto/evp/encode.c b/main/openssl/crypto/evp/encode.c
index 28546a84..4654bdc6 100644
--- a/main/openssl/crypto/evp/encode.c
+++ b/main/openssl/crypto/evp/encode.c
@@ -324,6 +324,7 @@ int EVP_DecodeUpdate(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl,
 				v=EVP_DecodeBlock(out,d,n);
 				n=0;
 				if (v < 0) { rv=0; goto end; }
+				if (eof > v) { rv=-1; goto end; }
 				ret+=(v-eof);
 				}
 			else
-- 
cgit v1.2.3