From: Abhimanyu Swami <abhimanyu1.s@samsung.com>
Date: Wed, 17 Mar 2021 08:00:34 +0000 (+0530)
Subject: SVACE issue fix
X-Git-Tag: submit/tizen/20210324.120036^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F48%2F255348%2F2;p=platform%2Fcore%2Fmessaging%2Fmsg-service.git

SVACE issue fix

Change-Id: I6912495e50650f5e091063fffcd4450cff06f902
Signed-off-by: Abhimanyu Swami <abhimanyu1.s@samsung.com>
---

diff --git a/plugin/sms_plugin/3gpp2/Sms3gpp2Codec.cpp b/plugin/sms_plugin/3gpp2/Sms3gpp2Codec.cpp
index 5a92d5b..c00684c 100755
--- a/plugin/sms_plugin/3gpp2/Sms3gpp2Codec.cpp
+++ b/plugin/sms_plugin/3gpp2/Sms3gpp2Codec.cpp
@@ -2074,15 +2074,16 @@ int Sms3gpp2MsgCodec::encodeUserData(const unsigned char* src, unsigned char *de
 	int shift = 0;
 
 	unsigned char *tmp = (unsigned char *)calloc(1, src_size+1);
-	for (i = 0; i < src_size; i++) {
-		tmp[i] = src[i] << 1;
-	}
 
 	if (tmp == NULL){
 		MSG_ERR("failed to allocate memory");
 		goto END;
 	}
 
+	for (i = 0; i < src_size; i++) {
+		tmp[i] = src[i] << 1;
+	}
+
 	for (i = 0; i < src_size; i++) {
 		shift = j % 7;
 		dest[j++] = (tmp[i] << shift) + (tmp[i+1] >> (7-shift));
diff --git a/utils/MsgUtilStorage.cpp b/utils/MsgUtilStorage.cpp
index 8dfcb78..e6b2c20 100755
--- a/utils/MsgUtilStorage.cpp
+++ b/utils/MsgUtilStorage.cpp
@@ -2230,7 +2230,6 @@ msg_error_t MsgStoGetConversationViewList(msg_thread_id_t threadId, msg_struct_l
 	MSG_DEBUG("pConvViewList->nCount [%d]", pConvViewList->nCount);
 
 	pConvViewList->msg_struct_info = (msg_struct_t *)calloc(rowCnt, sizeof(msg_struct_t));
-	memset(pConvViewList->msg_struct_info, 0x00, sizeof(msg_struct_t) * rowCnt);
 
 	if (pConvViewList->msg_struct_info == NULL){
 		dbHandle->freeTable();