From 39210cdd3ac0ce124737b13288eee4daee07554d Mon Sep 17 00:00:00 2001 From: "js126.lee" Date: Tue, 29 Nov 2016 16:42:50 +0900 Subject: [PATCH] Add to Null checking log in IsSameEowner When building with MULTIPLE_OWNER=1, ace is updated as appending alwadys, because the return value is false in IsSameEowner in case both ewoner1 and ewoner 2 are NULL. Change-Id: I0068db4196fb467e4c95d29ae808848d95776bbe Signed-off-by: js126.lee Reviewed-on: https://gerrit.iotivity.org/gerrit/14891 Reviewed-by: Chul Lee Reviewed-by: Jongmin Choi Tested-by: jenkins-iotivity Reviewed-by: Randeep Singh (cherry picked from commit 73b04a36692e1d23931b621262298b5a4b7f8431) Reviewed-on: https://gerrit.iotivity.org/gerrit/14899 --- resource/csdk/security/src/aclresource.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/resource/csdk/security/src/aclresource.c b/resource/csdk/security/src/aclresource.c index e41cfa0..94118bc 100644 --- a/resource/csdk/security/src/aclresource.c +++ b/resource/csdk/security/src/aclresource.c @@ -1705,13 +1705,18 @@ static bool IsSameValidities(OicSecValidity_t* validities1, OicSecValidity_t* va #ifdef _ENABLE_MULTIPLE_OWNER_ static bool IsSameEowner(OicUuid_t* eowner1, OicUuid_t* eowner2) { - if(NULL != eowner1 && NULL != eowner2) + if (NULL != eowner1 && NULL != eowner2) { if (memcmp(eowner1->id, eowner2->id, sizeof(eowner1->id)) == 0) { return true; } } + else if (NULL == eowner1 && NULL == eowner2) + { + OIC_LOG(DEBUG, TAG, "Both eowner1 and eowner2 are NULL"); + return true; + } return false; } -- 2.7.4