From 6d1073502061bb8b411f5416c1542f2ce81725b4 Mon Sep 17 00:00:00 2001 From: "hyuna0213.jo" Date: Wed, 1 Feb 2017 20:53:50 +0900 Subject: [PATCH] Fix static analysis issue in base layer -cainterfacecontroller.c: fix dereference memory -oickeepalive.c: add null check logic Change-Id: Iaa839b5a8c4eba44934931d9e3b3a529a07a762e Signed-off-by: hyuna0213.jo Reviewed-on: https://gerrit.iotivity.org/gerrit/16997 Tested-by: jenkins-iotivity Reviewed-by: Dan Mihai --- resource/csdk/connectivity/src/cainterfacecontroller.c | 1 + resource/csdk/stack/src/oickeepalive.c | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/resource/csdk/connectivity/src/cainterfacecontroller.c b/resource/csdk/connectivity/src/cainterfacecontroller.c index 427c436..c54547d 100644 --- a/resource/csdk/connectivity/src/cainterfacecontroller.c +++ b/resource/csdk/connectivity/src/cainterfacecontroller.c @@ -215,6 +215,7 @@ static void RemoveAllNetworkStateChangedCallback() OIC_LOG(DEBUG, TAG, "remove all callbacks"); LL_DELETE(g_networkChangeCallbackList, callback); OICFree(callback); + callback = NULL; } } diff --git a/resource/csdk/stack/src/oickeepalive.c b/resource/csdk/stack/src/oickeepalive.c index a179068..89a69ca 100644 --- a/resource/csdk/stack/src/oickeepalive.c +++ b/resource/csdk/stack/src/oickeepalive.c @@ -910,6 +910,12 @@ OCStackResult AddResourceInterfaceNameToPayload(OCRepPayload *payload) { size_t ifDim[MAX_REP_ARRAY_DEPTH] = {numElement, 0, 0}; char **itf = (char **)OICMalloc(sizeof(char *) * numElement); + if (!itf) + { + OIC_LOG(ERROR, TAG, "Could not allocate memory for itf"); + return OC_STACK_NO_MEMORY; + } + for (uint8_t i = 0; i < numElement; ++i) { const char *value = OCGetResourceInterfaceName(g_keepAliveHandle, i); -- 2.7.4