From 79bf087253ae19134affa5f965dff98653940d8b Mon Sep 17 00:00:00 2001 From: Jihun Ha Date: Mon, 17 Oct 2016 11:42:57 +0900 Subject: [PATCH] Add null checking for observe request in easy setup Checking if entityHandlerRequest is NULL is added. Change-Id: I79bf75c9f53f28b9c0c679a5dd7371552764b5cd Signed-off-by: Jihun Ha Reviewed-on: https://gerrit.iotivity.org/gerrit/13323 Reviewed-by: Heewon Park Tested-by: jenkins-iotivity Reviewed-by: Madan Lanka --- service/easy-setup/enrollee/src/resourcehandler.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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"); -- 2.7.4