From: Abhishek Sharma <ce.abhishek@samsung.com>
Date: Thu, 7 Apr 2016 15:03:08 +0000 (+0530)
Subject: Fix for crash issue when SID is not available
X-Git-Tag: 1.2.0+RC1~355^2^2~10
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=26b09679131002e4fa31ee0333b15fbb2c0de41e;p=platform%2Fupstream%2Fiotivity.git

Fix for crash issue when SID is not available

Change-Id: I583283e598c5eeb1e19e2a5c3ce6615070154d4c
Signed-off-by: Abhishek Sharma <ce.abhishek@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7659
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Markus Jung <markus.jung85@gmail.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
---

diff --git a/resource/csdk/stack/src/ocresource.c b/resource/csdk/stack/src/ocresource.c
index 3c0ee58..d109ba3 100755
--- a/resource/csdk/stack/src/ocresource.c
+++ b/resource/csdk/stack/src/ocresource.c
@@ -707,7 +707,12 @@ static OCStackResult HandleVirtualResource (OCServerRequest *request, OCResource
                 OCDiscoveryPayload *discPayload = (OCDiscoveryPayload *)payload;
                 discPayload->sid = (char *)OICCalloc(1, UUID_STRING_SIZE);
                 VERIFY_NON_NULL(discPayload->sid, ERROR, OC_STACK_NO_MEMORY);
-                memcpy(discPayload->sid, OCGetServerInstanceIDString(), UUID_STRING_SIZE);
+                const char* uid = OCGetServerInstanceIDString();
+                if(uid)
+                {
+                    memcpy(discPayload->sid, uid, UUID_STRING_SIZE);
+                }
+
                 if (!resourceTypeQuery && interfaceQuery && (0 == strcmp(interfaceQuery, OC_RSRVD_INTERFACE_LL)))
                 {
                     for (; resource && discoveryResult == OC_STACK_OK; resource = resource->next)