Fix for Memory leak results from static analyzer for NS C++ Wrapper.

Change-Id: I97ca331ce6fcd7352350fd36426366433a5521a2
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13307
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit 1b4cea1ba6bb1b57214e0c3bbb6e84f214dda971)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13403
Tested-by: Uze Choi <uzchoi@samsung.com>

diff --git a/service/notification/cpp-wrapper/consumer/src/NSConsumerService.cpp b/service/notification/cpp-wrapper/consumer/src/NSConsumerService.cpp
index ec11649c9531ddfbb411088cb48816e298d4fdb1..4187c9c0fcc34414d80a62eb046ff01d526afa60 100755 (executable)
--- a/service/notification/cpp-wrapper/consumer/src/NSConsumerService.cpp
+++ b/service/notification/cpp-wrapper/consumer/src/NSConsumerService.cpp
@@ -36,12 +36,13 @@ namespace OIC
             NS_LOG_V(DEBUG, "provider Id : %s", provider->providerId);\r
             NS_LOG_V(DEBUG, "state : %d", (int)state);\r
 \r
-            NSProvider *nsProvider = new NSProvider(provider);\r
-            NSProvider *oldProvider = NSConsumerService::getInstance()->getProvider(\r
-                                          nsProvider->getProviderId());\r
+            std::string provId;\r
+            provId.assign(provider->providerId, NS_UTILS_UUID_STRING_SIZE - 1);\r
+            NSProvider *oldProvider = NSConsumerService::getInstance()->getProvider(provId);\r
 \r
             if (oldProvider == nullptr)\r
             {\r
+                NSProvider *nsProvider = new NSProvider(provider);\r
                 NS_LOG(DEBUG, "Provider with same Id do not exist. updating Data for New Provider");\r
                 auto discoveredCallback = NSConsumerService::getInstance()->getProviderDiscoveredCb();\r
                 nsProvider->setProviderState((NSProviderState)state);\r
@@ -72,7 +73,6 @@ namespace OIC
                 NS_LOG(DEBUG, "Provider with same Id exists. updating the old Provider data");\r
                 auto changeCallback = oldProvider->getProviderStateReceivedCb();\r
                 oldProvider->setProviderState((NSProviderState)state);\r
-                delete nsProvider;\r
                 if (state == NS_ALLOW)\r
                 {\r
                     oldProvider->setProviderSubscribedState(NSProviderSubscribedState::SUBSCRIBED);\r

diff --git a/service/notification/cpp-wrapper/consumer/src/NSProvider.cpp b/service/notification/cpp-wrapper/consumer/src/NSProvider.cpp
index a9e4261c04764ddd3f063916d4c97b4d2de3a147..c70a317c06e687dd1f8b06e3d7e5604104932b08 100755 (executable)
--- a/service/notification/cpp-wrapper/consumer/src/NSProvider.cpp
+++ b/service/notification/cpp-wrapper/consumer/src/NSProvider.cpp
@@ -160,6 +160,24 @@ namespace OIC
             NS_LOG_V(DEBUG, "calling Lower layer UpdateTopicList for Provider Id : %s",\r
                      getProviderId().c_str());\r
             NSResult result = (NSResult) NSConsumerUpdateTopicList(getProviderId().c_str(), topicLL);\r
+\r
+            if(topicLL);\r
+            {\r
+                NSTopicLL * iter = topicLL;\r
+                NSTopicLL * following = NULL;\r
+\r
+                while (iter)\r
+                {\r
+                    following = iter->next;\r
+                    if(iter);\r
+                    {\r
+                        NSOICFree(iter->topicName);\r
+                        iter->next = NULL;\r
+                        NSOICFree(iter);\r
+                    }\r
+                    iter = following;\r
+                }\r
+            }\r
             NS_LOG(DEBUG, "updateTopicList - OUT");\r
             return result;\r
         }\r

diff --git a/service/notification/cpp-wrapper/examples/linux/notificationserviceconsumer.cpp b/service/notification/cpp-wrapper/examples/linux/notificationserviceconsumer.cpp
index 1efff709724b12a43b6c23ea6f89b22a3122eefc..c7227138a17e471abbde034dc255c978795fb2c2 100755 (executable)
--- a/service/notification/cpp-wrapper/examples/linux/notificationserviceconsumer.cpp
+++ b/service/notification/cpp-wrapper/examples/linux/notificationserviceconsumer.cpp
@@ -19,6 +19,7 @@
  ******************************************************************/\r
 \r
 #include <iostream>\r
+#include <limits>\r
 \r
 #include <unistd.h>\r
 #include "NSConsumerService.h"\r
@@ -203,6 +204,8 @@ int main(void)
                         topicList->addTopic("OCF_TOPIC3", NSTopic::NSTopicState::UNSUBSCRIBED);\r
 \r
                         provider->updateTopicList(topicList);\r
+                        delete topicList;\r
+                        delete provider;\r
                     }\r
                 }\r
                 break;\r
@@ -218,9 +221,12 @@ int main(void)
 #endif\r
             case 6:\r
                 std::cout << "6. Exit" << std::endl;\r
+                NSConsumerService::getInstance()->stop();\r
                 isExit = true;\r
                 break;\r
             default:\r
+                std::cin.clear();\r
+                std::cin.ignore(numeric_limits<streamsize>::max(), '\n');\r
                 break;\r
         }\r
     }\r

diff --git a/service/notification/cpp-wrapper/examples/linux/notificationserviceprovider.cpp b/service/notification/cpp-wrapper/examples/linux/notificationserviceprovider.cpp
index 374405e23b92b4075d5d8333b1311fc834ce961d..eef42dbff5499563d8db687e444aceb60ed44714 100755 (executable)
--- a/service/notification/cpp-wrapper/examples/linux/notificationserviceprovider.cpp
+++ b/service/notification/cpp-wrapper/examples/linux/notificationserviceprovider.cpp
@@ -113,7 +113,7 @@ int main()
         std::cout << "12. Disable NS Provider RemoteService" << std::endl;\r
 #endif\r
         std::cout << "13. Stop the Notification Provider" << std::endl;\r
-        std::cout << "0. Exit()" << std::endl;\r
+        std::cout << "14. Exit()" << std::endl;\r
 \r
         std::cout << "input : ";\r
 \r
@@ -284,12 +284,14 @@ int main()
             case 13:\r
                 NSProviderService::getInstance()->stop();\r
                 break;\r
-            case 0:\r
+            case 14:\r
                 NSProviderService::getInstance()->stop();\r
                 isExit = true;\r
                 break;\r
             default:\r
                 std::cout << "Under Construction" << std::endl;\r
+                std::cin.clear();\r
+                std::cin.ignore(numeric_limits<streamsize>::max(), '\n');\r
                 break;\r
         }\r
 \r

diff --git a/service/notification/cpp-wrapper/provider/src/NSProviderService.cpp b/service/notification/cpp-wrapper/provider/src/NSProviderService.cpp
index 5eed9434a5307928e948dfa52ebd0034018559dd..79d2dc5aee6338ba910765661bd03b8afd0231f2 100755 (executable)
--- a/service/notification/cpp-wrapper/provider/src/NSProviderService.cpp
+++ b/service/notification/cpp-wrapper/provider/src/NSProviderService.cpp
@@ -114,6 +114,7 @@ namespace OIC
             nsConfig.resourceSecurity = config.resourceSecurity;\r
 \r
             NSResult result = (NSResult) NSStartProvider(nsConfig);\r
+            OICFree(nsConfig.userInfo);\r
             NS_LOG(DEBUG, "start - OUT");\r
             return result;\r
         }\r
@@ -166,6 +167,12 @@ namespace OIC
 \r
                 NS_LOG_V(DEBUG, "nsMsg->providerId : %s", nsMsg->providerId);\r
                 result = (NSResult) NSSendMessage(nsMsg);\r
+                OICFree(nsMsg->dateTime);\r
+                OICFree(nsMsg->title);\r
+                OICFree(nsMsg->contentText);\r
+                OICFree(nsMsg->sourceName);\r
+                OICFree(nsMsg->topic);\r
+                OICFree(nsMsg->extraInfo);\r
                 delete nsMsg->mediaContents;\r
                 delete nsMsg;\r
             }\r
@@ -197,6 +204,7 @@ namespace OIC
             NS_LOG_V(DEBUG, "Provider ID : %s", nsMessage->getProviderId().c_str());\r
             NS_LOG(DEBUG, "createMessage - OUT");\r
 \r
+            OICFree(message);\r
             return nsMessage;\r
         }\r
 \r