From 62dc200e8dc44f6363749da22dd4d9dff5cdb81a Mon Sep 17 00:00:00 2001 From: Erich Keane Date: Wed, 12 Aug 2015 17:50:34 -0700 Subject: [PATCH] Fixed crash in bool arrays not being added properly on parse The parser had a mistaken condition, so that a boolean array will never be added as a type to a rep payload. This corrects the && to || in order to ensure that it actually executes! Change-Id: I215e5477596f7c5ad49e2a79a3af619343ef74d8 Signed-off-by: Erich Keane Reviewed-on: https://gerrit.iotivity.org/gerrit/2194 Tested-by: jenkins-iotivity Reviewed-by: Jon A. Cruz --- resource/csdk/stack/src/ocpayloadparse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resource/csdk/stack/src/ocpayloadparse.c b/resource/csdk/stack/src/ocpayloadparse.c index 05c6b59..aa63c53 100644 --- a/resource/csdk/stack/src/ocpayloadparse.c +++ b/resource/csdk/stack/src/ocpayloadparse.c @@ -635,7 +635,7 @@ static bool OCParseArray(OCRepPayload* out, const char* name, CborValue* contain err = err || cbor_value_get_boolean(&insideArray, &(((bool*)arr)[i])); err = err || cbor_value_advance_fixed(&insideArray); } - if(err && !OCRepPayloadSetBoolArrayAsOwner(out, name, (bool*)arr, dimensions)) + if(err || !OCRepPayloadSetBoolArrayAsOwner(out, name, (bool*)arr, dimensions)) { OICFree(arr); err = true; -- 2.7.4