From: VBS <vdtizen.sds@samsung.com>
Date: Thu, 17 Jan 2019 05:04:04 +0000 (+0900)
Subject: Fix Svace issue
X-Git-Tag: submit/tizen/20190117.054631^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F05%2F197905%2F6;p=platform%2Fcore%2Fconnectivity%2Fsmartcard-service.git

Fix Svace issue

- WGID : 371009

Change-Id: I7366956561bd33d916d4bf2fd7af1440020c6f33
---

diff --git a/server/ServerResource.cpp b/server/ServerResource.cpp
old mode 100644
new mode 100755
index 1b06abe..55e0d8f
--- a/server/ServerResource.cpp
+++ b/server/ServerResource.cpp
@@ -849,6 +849,11 @@ namespace smartcard_service_api
 				if (item->second != IntegerHandle::INVALID_HANDLE) {
 					terminal = getTerminal(item->second);
 					if (terminal != NULL) {
+						if (terminal->getName() == NULL) {
+							_ERR("terminal name is NULL");
+							return -1;
+						}
+
 						if (terminal->isSecureElementPresence()) {
 							length += sizeof(nameLen) + strlen(terminal->getName()) + sizeof(unsigned int);
 							result++;
@@ -857,9 +862,9 @@ namespace smartcard_service_api
 				}
 			}
 
-			buffer = new unsigned char[length];
+			buffer = new unsigned char[length + 1];
 			if (buffer != NULL) {
-				memset(buffer, 0, length);
+				memset(buffer, 0, length + 1);
 
 				for (item = mapReaders.begin(); item != mapReaders.end(); item++) {
 					if (item->second != IntegerHandle::INVALID_HANDLE) {
@@ -876,6 +881,8 @@ namespace smartcard_service_api
 
 								memcpy(buffer + offset, &item->first, sizeof(unsigned int));
 								offset += sizeof(unsigned int);
+
+								buffer[offset] = '\0';
 							}
 						}
 					}