From: Manoj Gupta <manoj.g2@samsung.com>
Date: Tue, 8 Mar 2016 14:47:10 +0000 (+0530)
Subject: Memory Leak of capi context resolved
X-Git-Tag: 1.2.0+RC1~535
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=27cf3ca168f65eb9c502f6612a6703ccc24f5855;p=platform%2Fupstream%2Fiotivity.git

Memory Leak of capi context resolved

Change-Id: I60857c492efdbf5890ad500cbeeb7b9138bfa73f
Signed-off-by: Manoj Gupta <manoj.g2@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5557
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
---

diff --git a/resource/csdk/connectivity/lib/libcoap-4.1.1/net.c b/resource/csdk/connectivity/lib/libcoap-4.1.1/net.c
index d3ea2ec..580729b 100644
--- a/resource/csdk/connectivity/lib/libcoap-4.1.1/net.c
+++ b/resource/csdk/connectivity/lib/libcoap-4.1.1/net.c
@@ -324,20 +324,23 @@ coap_new_context(const coap_address_t *listen_addr)
 #if defined(WITH_POSIX)
     coap_context_t *c = coap_malloc( sizeof( coap_context_t ) );
     int reuse = 1;
-#endif /* WITH_POSIX */
-#ifdef WITH_LWIP
-    coap_context_t *c = memp_malloc(MEMP_COAP_CONTEXT);
-#endif /* WITH_LWIP */
-#ifdef WITH_CONTIKI
-    coap_context_t *c;
-
+#elif WITH_CONTIKI
+    coap_context_t *c =NULL;
     if (initialized)
-    return NULL;
-#endif /* WITH_CONTIKI */
-
+    {
+        return NULL;
+    }
+#elif WITH_LWIP
+    coap_context_t *c = memp_malloc(MEMP_COAP_CONTEXT);
+#endif /* WITH_POSIX */
     if (!listen_addr)
     {
         coap_log(LOG_EMERG, "no listen address specified\n");
+#if defined(WITH_POSIX)
+        coap_free_context(c);
+#elif WITH_LWIP
+        memp_free(c);
+#endif
         return NULL;
     }