From 2fac07c1c2b53ae616c54c00f39995d66b94a929 Mon Sep 17 00:00:00 2001 From: Ravi Nanjundappa Date: Wed, 1 Jul 2015 19:14:42 +0530 Subject: [PATCH] stack: Fixes cppcheck issue in ocserverrequest This patch fixes the the below issue reported by cppcheck tool in stack dir: "(error) Possible null pointer dereference: ehResponse - otherwise it is redundant to check if ehResponse is null at line 445 " Dereferencing of ehResponse is done after NULL check. Change-Id: I9cc20ce2386b5bdb08c4d9f9dbd2d143040f9a0f Signed-off-by: Ravi Nanjundappa Reviewed-on: https://gerrit.iotivity.org/gerrit/1509 Reviewed-by: Erich Keane Tested-by: Erich Keane --- resource/csdk/stack/src/ocserverrequest.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resource/csdk/stack/src/ocserverrequest.c b/resource/csdk/stack/src/ocserverrequest.c index e4aac79..98d6040 100644 --- a/resource/csdk/stack/src/ocserverrequest.c +++ b/resource/csdk/stack/src/ocserverrequest.c @@ -440,13 +440,13 @@ OCStackResult HandleSingleResponse(OCEntityHandlerResponse * ehResponse) CAResponseInfo_t responseInfo = {}; CAHeaderOption_t* optionsPointer = NULL; - OC_LOG_V(INFO, TAG, "Inside HandleSingleResponse: %s", ehResponse->payload); - if(!ehResponse || !ehResponse->requestHandle) { return OC_STACK_ERROR; } + OC_LOG_V(INFO, TAG, "Inside HandleSingleResponse: %s", ehResponse->payload); + if(ehResponse->payloadSize >= (MAX_RESPONSE_LENGTH))// - OC_JSON_PREFIX_LEN - OC_JSON_SUFFIX_LEN)) { OC_LOG_V(ERROR, TAG, "Response payload size was too large. Max is %hu, payload size was %hu", -- 2.7.4