SVACE fixes for C++ wrapper for Notification Service.

[platform/upstream/iotivity.git] / service / notification / cpp-wrapper / consumer / src / NSProvider.cpp

diff --git a/service/notification/cpp-wrapper/consumer/src/NSProvider.cpp b/service/notification/cpp-wrapper/consumer/src/NSProvider.cpp
index fe4c228..7aa94be 100755 (executable)
--- a/service/notification/cpp-wrapper/consumer/src/NSProvider.cpp
+++ b/service/notification/cpp-wrapper/consumer/src/NSProvider.cpp
@@ -23,6 +23,7 @@
 #include "NSConsumerInterface.h"\r
 #include "NSConstants.h"\r
 #include "NSCommon.h"\r
+#include "NSUtils.h"\r
 #include "oic_string.h"\r
 \r
 namespace OIC\r
@@ -32,7 +33,7 @@ namespace OIC
         ::NSProvider *NSProvider::getNSProvider()\r
         {\r
             ::NSProvider *provider = new ::NSProvider;\r
-            OICStrcpy(provider->providerId, m_providerId.length(), m_providerId.c_str());\r
+            OICStrcpy(provider->providerId, NS_UTILS_UUID_STRING_SIZE, m_providerId.c_str());\r
             return provider;\r
         }\r
 \r
@@ -42,8 +43,7 @@ namespace OIC
             m_syncInfoCb = NULL;\r
             if (provider != nullptr)\r
             {\r
-                if ((provider->providerId != nullptr) && strlen(provider->providerId))\r
-                    m_providerId.assign(provider->providerId, strlen(provider->providerId));\r
+                m_providerId.assign(provider->providerId, NS_UTILS_UUID_STRING_SIZE);\r
             }\r
         }\r
 \r