[IOT-2342] Fix a crash issue on secureresourcemanager.c

Add null checking for a resource object which could be NULL if server
receives a request message including resource uri which server doesn't
have.

Change-Id: Idf29a43aeca5a919c0b22d3f0cd9ce507c8935ab
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20297
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>

1 files changed, 21 insertions, 15 deletions

diff --git a/resource/csdk/security/src/secureresourcemanager.c b/resource/csdk/security/src/secureresourcemanager.c
index b95b122b2..bd447b615 100644
--- a/resource/csdk/security/src/secureresourcemanager.c
+++ b/resource/csdk/security/src/secureresourcemanager.c
@@ -167,32 +167,38 @@ static void SetResourceUriAndType(SRMRequestContext_t *context)
 
 static void SetDiscoverable(SRMRequestContext_t *context)
 {
-    OCResource *resource;
     if (NULL == context)
     {
         OIC_LOG_V(ERROR, TAG, "%s: Null context.", __func__);
         context->discoverable = DISCOVERABLE_NOT_KNOWN;
+        return;
     }
-    else if (NULL == context->resourceUri)
+    if (NULL == context->resourceUri)
     {
         OIC_LOG_V(ERROR, TAG, "%s: Null resourceUri.", __func__);
         context->discoverable = DISCOVERABLE_NOT_KNOWN;
+        return;
+    }
+
+    OCResource *resource = FindResourceByUri(context->resourceUri);
+    if (NULL == resource)
+    {
+        OIC_LOG_V(ERROR, TAG, "%s: Unkown resourceUri(%s).", __func__, context->resourceUri);
+        context->discoverable = DISCOVERABLE_NOT_KNOWN;
+        return;
+    }
+
+    if (OC_DISCOVERABLE == (resource->resourceProperties & OC_DISCOVERABLE))
+    {
+        context->discoverable = DISCOVERABLE_TRUE;
+        OIC_LOG_V(DEBUG, TAG, "%s: resource %s is OC_DISCOVERABLE.",
+                  __func__, context->resourceUri);
     }
     else
     {
-        resource = FindResourceByUri(context->resourceUri);
-        if (OC_DISCOVERABLE == (resource->resourceProperties & OC_DISCOVERABLE))
-        {
-            context->discoverable = DISCOVERABLE_TRUE;
-            OIC_LOG_V(DEBUG, TAG, "%s: resource %s is OC_DISCOVERABLE.",
-                __func__, context->resourceUri);
-        }
-        else
-        {
-            context->discoverable = DISCOVERABLE_FALSE;
-            OIC_LOG_V(DEBUG, TAG, "%s: resource %s is NOT OC_DISCOVERABLE.",
-                __func__, context->resourceUri);
-        }
+        context->discoverable = DISCOVERABLE_FALSE;
+        OIC_LOG_V(DEBUG, TAG, "%s: resource %s is NOT OC_DISCOVERABLE.",
+                  __func__, context->resourceUri);
     }
 }