Fix for SVACE defects

[platform/upstream/iotivity.git] / service / notification / src / provider / NSProviderSubscription.c

diff --git a/service/notification/src/provider/NSProviderSubscription.c b/service/notification/src/provider/NSProviderSubscription.c
index 3116cbb..a275660 100644 (file)
--- a/service/notification/src/provider/NSProviderSubscription.c
+++ b/service/notification/src/provider/NSProviderSubscription.c
@@ -21,6 +21,8 @@
 #include "NSProviderSubscription.h"\r
 #include "NSProviderListener.h"\r
 \r
+NSCacheList * consumerSubList;\r
+\r
 NSResult NSInitSubscriptionList()\r
 {\r
     NS_LOG(DEBUG, "NSInitSubscriptionList - IN");\r
@@ -142,8 +144,12 @@ void NSHandleSubscription(OCEntityHandlerRequest *entityHandlerRequest, NSResour
         NSCacheElement * element = (NSCacheElement *) OICMalloc(sizeof(NSCacheElement));\r
         NS_VERIFY_NOT_NULL_V(element);\r
         NSCacheSubData * subData = (NSCacheSubData *) OICMalloc(sizeof(NSCacheSubData));\r
-        NS_VERIFY_NOT_NULL_V(subData);\r
-\r
+        if (!subData)\r
+        {\r
+            NS_LOG(ERROR, "Memory assignment to subData failed");\r
+            NSOICFree(element);\r
+            return;\r
+        }\r
         OICStrcpy(subData->id, UUID_STRING_SIZE, id);\r
         NS_LOG_V(INFO_PRIVATE, "SubList ID = [%s]", subData->id);\r
 \r
@@ -203,7 +209,12 @@ void NSHandleSubscription(OCEntityHandlerRequest *entityHandlerRequest, NSResour
         NSCacheElement * element = (NSCacheElement *) OICMalloc(sizeof(NSCacheElement));\r
         NS_VERIFY_NOT_NULL_V(element);\r
         NSCacheSubData * subData = (NSCacheSubData *) OICMalloc(sizeof(NSCacheSubData));\r
-        NS_VERIFY_NOT_NULL_V(subData);\r
+        if (!subData)\r
+        {\r
+            NS_LOG(ERROR, "Memory assignment to subData failed");\r
+            NSOICFree(element);\r
+            return;\r
+        }\r
 \r
         OICStrcpy(subData->id, UUID_STRING_SIZE, id);\r
         NS_LOG_V(INFO_PRIVATE, "SubList ID = [%s]", subData->id);\r