[CONPRO-1176] iotivity crash during CAReceiveMessage

 - manually patched from below pull request because of VD PVR schedule

 - https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/215
Signed-off-by: kmook <kmook.choi@samsung.com>
Change-Id: I58811d5a50211aeaddf06c5cdab751a5ca31b8eb

diff --git a/packaging/snapshot_history.txt b/packaging/snapshot_history.txt
index a456a26..cae0a64 100755 (executable)
--- a/packaging/snapshot_history.txt
+++ b/packaging/snapshot_history.txt
@@ -1,3 +1,11 @@
+http://suprem.sec.samsung.net/jira/browse/CONPRO-1176
+
+[CONPRO-1176] iotivity crash during CAReceiveMessage
+
+ - manually patched from below pull request because of VD PVR schedule
+
+ - https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/215
+----------------------------------------------------------------------------------------------------------------------------------
 [CONPRO-1172] allocates too much memory
 
  - rollback a patch to solve segmentation fault issue

diff --git a/resource/csdk/connectivity/src/adapter_util/ca_adapter_net_ssl.c b/resource/csdk/connectivity/src/adapter_util/ca_adapter_net_ssl.c
index 73831e4..b953c35 100644 (file)
--- a/resource/csdk/connectivity/src/adapter_util/ca_adapter_net_ssl.c
+++ b/resource/csdk/connectivity/src/adapter_util/ca_adapter_net_ssl.c
@@ -1410,9 +1410,9 @@ static void RemovePeerFromList(const CAEndpoint_t * endpoint)
                 && (endpoint->port == tep->sep.endpoint.port || CA_ADAPTER_GATT_BTLE == endpoint->adapter))
         {
             u_arraylist_remove(g_caSslContext->peerList, listIndex);
-            DeleteSslEndPoint(tep);
             OIC_LOG_V(INFO, NET_SSL_TAG, "Remove Peer:[%s:%d] for %d adapter",
                     endpoint->addr, endpoint->port, endpoint->adapter);
+            DeleteSslEndPoint(tep);
             OIC_LOG_V(DEBUG, NET_SSL_TAG, "Out %s", __func__);
             return;
         }