Fixed memory leak detected by valgrind

Fixed memory leak detected by valgrind

Change-Id: I96c4d0816ea5be4a90e20af59e64ea3aec454c27
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18227
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

diff --git a/resource/csdk/connectivity/src/caretransmission.c b/resource/csdk/connectivity/src/caretransmission.c
index 535e48c..4435ef6 100644 (file)
--- a/resource/csdk/connectivity/src/caretransmission.c
+++ b/resource/csdk/connectivity/src/caretransmission.c
@@ -643,6 +643,7 @@ CAResult_t CARetransmissionDestroy(CARetransmission_t *context)
         }
         CAFreeEndpoint(data->endpoint);
         OICFree(data->pdu);
+        OICFree(data);
     }
     oc_mutex_unlock(context->threadMutex);
 

diff --git a/resource/csdk/connectivity/test/cablocktransfertest.cpp b/resource/csdk/connectivity/test/cablocktransfertest.cpp
index 5e89e35..2ec2c25 100644 (file)
--- a/resource/csdk/connectivity/test/cablocktransfertest.cpp
+++ b/resource/csdk/connectivity/test/cablocktransfertest.cpp
@@ -721,6 +721,10 @@ TEST_F(CABlockTransferTests, CAUpdatePayloadToCADataWithRequest)
     EXPECT_EQ(CA_STATUS_OK, CAUpdatePayloadToCAData(&cadata, payload, payloadLen));
 
     EXPECT_STREQ((const char*) payload, (const char*) cadata.requestInfo->info.payload);
+
+    free(cadata.requestInfo->info.payload);
+    CADestroyToken(tempToken);
+    CADestroyEndpoint(tempRep);
 }
 
 TEST_F(CABlockTransferTests, CAUpdatePayloadToCADataWithResponse)
@@ -755,4 +759,8 @@ TEST_F(CABlockTransferTests, CAUpdatePayloadToCADataWithResponse)
     EXPECT_EQ(CA_STATUS_OK, CAUpdatePayloadToCAData(&cadata, payload, payloadLen));
 
     EXPECT_STREQ((const char*) payload, (const char*) cadata.responseInfo->info.payload);
+
+    free(cadata.responseInfo->info.payload);
+    CADestroyToken(tempToken);
+    CADestroyEndpoint(tempRep);
 }

diff --git a/resource/csdk/connectivity/test/caprotocolmessagetest.cpp b/resource/csdk/connectivity/test/caprotocolmessagetest.cpp
index a31ed6e..21f08f4 100644 (file)
--- a/resource/csdk/connectivity/test/caprotocolmessagetest.cpp
+++ b/resource/csdk/connectivity/test/caprotocolmessagetest.cpp
@@ -27,6 +27,7 @@
 
 #include "gtest/gtest.h"
 
+#include "oic_malloc.h"
 #include "caprotocolmessage.h"
 
 namespace {
@@ -218,6 +219,8 @@ TEST(CAProtocolMessage, CAGetTokenFromPDU)
     outData.type = CA_MSG_NONCONFIRM;
 
     EXPECT_EQ(CA_STATUS_OK, CAGetTokenFromPDU(pdu->transport_hdr, &outData, &tempRep));
+
+    OICFree(outData.token);
     coap_delete_list(options);
     coap_delete_pdu(pdu);
 }
@@ -253,6 +256,8 @@ TEST(CAProtocolMessage, CAGetInfoFromPDU)
     memset(&outData, 0, sizeof(CAInfo_t));
 
     EXPECT_EQ(CA_STATUS_OK, CAGetInfoFromPDU(pdu, &tempRep, &code, &outData));
+
+    OICFree(outData.token);
     coap_delete_list(options);
     coap_delete_pdu(pdu);
 }

diff --git a/resource/csdk/connectivity/test/uqueue_test.cpp b/resource/csdk/connectivity/test/uqueue_test.cpp
index f461d46..ba439a9 100644 (file)
--- a/resource/csdk/connectivity/test/uqueue_test.cpp
+++ b/resource/csdk/connectivity/test/uqueue_test.cpp
@@ -157,6 +157,7 @@ TEST_F(UQueueF, Get)
     {
         u_queue_message_t *value = u_queue_get_element(queue);
         ASSERT_TRUE(value != NULL);
+        OICFree(value);
     }
 }