From: YounghyunJoo Date: Thu, 1 Sep 2016 05:46:28 +0000 (+0900) Subject: Modify Svace Issue X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=080c1b9fcf3901f4c3b742a7fbab34435ec7d759;p=contrib%2Fiotivity.git Modify Svace Issue - Fix bug for checking NSResult is validate - Fix bug for value null check Change-Id: Ie0cab2ae4d7487a3f0ef310fda938893f4fe84ef Signed-off-by: YounghyunJoo Reviewed-on: https://gerrit.iotivity.org/gerrit/11251 Tested-by: jenkins-iotivity Reviewed-by: Uze Choi --- diff --git a/service/notification/src/consumer/NSConsumerCommon.c b/service/notification/src/consumer/NSConsumerCommon.c index 90e87bd..4f6af44 100644 --- a/service/notification/src/consumer/NSConsumerCommon.c +++ b/service/notification/src/consumer/NSConsumerCommon.c @@ -393,7 +393,8 @@ NSTopicLL * NSCopyTopicLL(NSTopicLL * topicHead) NS_VERIFY_NOT_NULL_WITH_POST_CLEANING(newTopicNode, NULL, NSRemoveTopicLL(newTopicHead)); NSResult ret = NSInsertTopicNode(newTopicHead, newTopicNode); - NS_VERIFY_STACK_SUCCESS_WITH_POST_CLEANING(ret, NULL, NSRemoveTopicLL(newTopicHead)); + NS_VERIFY_NOT_NULL_WITH_POST_CLEANING(ret == NS_OK ? (void *)1 : NULL, + NULL, NSRemoveTopicLL(newTopicHead)); iter = (NSTopicLL *) iter->next; } diff --git a/service/notification/src/consumer/NSConsumerCommunication.c b/service/notification/src/consumer/NSConsumerCommunication.c index 1e15e21..7a794ab 100644 --- a/service/notification/src/consumer/NSConsumerCommunication.c +++ b/service/notification/src/consumer/NSConsumerCommunication.c @@ -436,6 +436,7 @@ void NSConsumerCommunicationTaskProcessing(NSTask * task) NS_VERIFY_NOT_NULL_V(connections); char * topicUri = OICStrdup(provider->topicUri); + NS_VERIFY_NOT_NULL_V(topicUri); OCConnectivityType type = CT_DEFAULT; if (connections->addr->adapter == OC_ADAPTER_TCP) @@ -524,6 +525,7 @@ void NSConsumerCommunicationTaskProcessing(NSTask * task) } char * topicUri = OICStrdup(provider->topicUri); + NS_VERIFY_NOT_NULL_V(topicUri); OCConnectivityType type = CT_DEFAULT; if (connections->addr->adapter == OC_ADAPTER_TCP) @@ -628,7 +630,8 @@ NSTopicLL * NSGetTopicLL(OCClientResponse * clientResponse) } NSResult ret = NSInsertTopicNode(topicLL, topicNode); - NS_VERIFY_STACK_SUCCESS_WITH_POST_CLEANING(ret, NULL, NSRemoveTopicLL(topicLL)); + NS_VERIFY_NOT_NULL_WITH_POST_CLEANING(ret == NS_OK ? (void *)1 : NULL, + NULL, NSRemoveTopicLL(topicLL)); } return topicLL;