Fix bugs for result of dynamic analizer.

[platform/upstream/iotivity.git] / service / notification / src / consumer / NSConsumerQueue.c

diff --git a/service/notification/src/consumer/NSConsumerQueue.c b/service/notification/src/consumer/NSConsumerQueue.c
index ae6cd2e..89495e7 100644 (file)
--- a/service/notification/src/consumer/NSConsumerQueue.c
+++ b/service/notification/src/consumer/NSConsumerQueue.c
@@ -38,18 +38,19 @@ NSConsumerQueue * NSCreateQueue()
 
 void NSDestroyQueue(NSConsumerQueue * queue)
 {
+    NS_VERIFY_NOT_NULL_V(queue);
+
     NSConsumerQueueObject * node = NSPopQueue(queue);
     while(node)
     {
-        node = (NSConsumerQueueObject *)node->next;
-        OICFree(node->data);
-        OICFree(node);
-    }
+        NSOICFree(node->data);
+        NSOICFree(node);
 
-    OICFree(queue);
+        node = NSPopQueue(queue);
+    }
 }
 
-bool NSPushQueue(NSConsumerQueue * queue, NSConsumerQueueObject * object)
+bool NSPushConsumerQueue(NSConsumerQueue * queue, NSConsumerQueueObject * object)
 {
     NS_VERIFY_NOT_NULL(queue, false);
     NS_VERIFY_NOT_NULL(object, false);