From 45cf4a61f24e7476506102eb4b5acdfbcb1f22c4 Mon Sep 17 00:00:00 2001
From: zhengchao <zhengchao@iie.ac.cn>
Date: Tue, 4 Jul 2017 11:29:28 +0800
Subject: [PATCH] =?UTF-8?q?EVP=5FCipherUpdate=E5=87=BD=E6=95=B0=E4=B8=8D?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5=E8=BE=93=E5=85=A5=E7=BC=93=E5=86=B2=E5=8C=BA?=
 =?UTF-8?q?=E9=95=BF=E5=BA=A6=EF=BC=8C=E5=9C=A8=E5=A4=96=E9=9D=A2=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E5=88=A4=E6=96=AD=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/entry/config_monitor.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/entry/config_monitor.cpp b/src/entry/config_monitor.cpp
index 4362a4c..3566a5f 100644
--- a/src/entry/config_monitor.cpp
+++ b/src/entry/config_monitor.cpp
@@ -82,6 +82,12 @@ int decrypt_open(FILE* in,const unsigned char* key, const char* algorithm,unsign
 		inlen = fread(inbuf, 1, MAX_CONFIG_LINE, in);
 		if (inlen <= 0)
 			break;
+		
+		if(out_buff_len-buff_offset<inlen+EVP_CIPHER_block_size(cipher)-1)
+		{
+			out_buff_len*=2;
+			*pp_out=(unsigned char*)realloc(*pp_out,out_buff_len);
+		}
 		out_blk_len=out_buff_len-buff_offset;
 		if (!EVP_CipherUpdate(ctx, *pp_out+buff_offset, &out_blk_len, inbuf, inlen))
 		{
@@ -90,11 +96,7 @@ int decrypt_open(FILE* in,const unsigned char* key, const char* algorithm,unsign
 			goto error_out;
 		}
 		buff_offset+=out_blk_len;
-		if(buff_offset==out_buff_len)
-		{
-		out_buff_len*=2;
-		*pp_out=(unsigned char*)realloc(*pp_out,out_buff_len);
-		}
+
 	}
 	if (!EVP_CipherFinal_ex(ctx, *pp_out+buff_offset, &out_blk_len))
 	{