SVACE fixes for C++ wrapper for Notification Service.

[platform/upstream/iotivity.git] / service / notification / cpp-wrapper / provider / src / NSConsumer.cpp

diff --git a/service/notification/cpp-wrapper/provider/src/NSConsumer.cpp b/service/notification/cpp-wrapper/provider/src/NSConsumer.cpp
index b10d6b9..e4d35bf 100755 (executable)
--- a/service/notification/cpp-wrapper/provider/src/NSConsumer.cpp
+++ b/service/notification/cpp-wrapper/provider/src/NSConsumer.cpp
@@ -22,6 +22,7 @@
 #include <cstring>\r
 #include "NSProviderInterface.h"\r
 #include "NSConstants.h"\r
+#include "NSUtils.h"\r
 #include "oic_string.h"\r
 \r
 namespace OIC\r
@@ -31,7 +32,7 @@ namespace OIC
         ::NSConsumer *NSConsumer::getNSConsumer()\r
         {\r
             ::NSConsumer *nsCon = new ::NSConsumer;\r
-            OICStrcpy(nsCon->consumerId, m_consumerId.length(), m_consumerId.c_str());\r
+            OICStrcpy(nsCon->consumerId, NS_UTILS_UUID_STRING_SIZE, m_consumerId.c_str());\r
             return nsCon;\r
         }\r
 \r
@@ -39,8 +40,7 @@ namespace OIC
         {\r
             if (consumer != nullptr)\r
             {\r
-                if ((consumer->consumerId != nullptr) && strlen(consumer->consumerId))\r
-                    m_consumerId.assign(consumer->consumerId, strlen(consumer->consumerId));\r
+                m_consumerId.assign(consumer->consumerId, NS_UTILS_UUID_STRING_SIZE);\r
             }\r
         }\r
 \r