From: Jihun Ha <jihun.ha@samsung.com>
Date: Mon, 17 Oct 2016 02:42:57 +0000 (+0900)
Subject: Add null checking for observe request in easy setup
X-Git-Tag: 1.3.0~1055^2~36
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=79bf087253ae19134affa5f965dff98653940d8b;p=platform%2Fupstream%2Fiotivity.git

Add null checking for observe request in easy setup

Checking if entityHandlerRequest is NULL is added.

Change-Id: I79bf75c9f53f28b9c0c679a5dd7371552764b5cd
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13323
Reviewed-by: Heewon Park <h_w.park@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
---

diff --git a/service/easy-setup/enrollee/src/resourcehandler.c b/service/easy-setup/enrollee/src/resourcehandler.c
index 21592c9..be8232b 100755
--- a/service/easy-setup/enrollee/src/resourcehandler.c
+++ b/service/easy-setup/enrollee/src/resourcehandler.c
@@ -1223,7 +1223,7 @@ OCEntityHandlerResult OCEntityHandlerCb(OCEntityHandlerFlag flag,
             ehRet = OC_EH_ERROR;
         }
     }
-    if (flag & OC_OBSERVE_FLAG)
+    if (entityHandlerRequest && (flag & OC_OBSERVE_FLAG))
     {
         OIC_LOG(INFO, ES_RH_TAG, "Flag includes OC_OBSERVE_FLAG");