From eff5b1879523483e90d02474cd19dfd125cfe3ea Mon Sep 17 00:00:00 2001 From: Habib Virji Date: Fri, 9 Dec 2016 13:55:46 +0000 Subject: [PATCH] NULL pointer check in cbor_test cbor_test directly uses value returned by OCRepPayloadGetPropeString in memcmp . The value is not checked before calling memcmp. BUG: https://jira.iotivity.org/browse/IOT-1662 Change-Id: Ia998ab4154d0b2efb69dff232532d2b8b7f4f5de Signed-off-by: Habib Virji Reviewed-on: https://gerrit.iotivity.org/gerrit/15365 Tested-by: jenkins-iotivity Reviewed-by: George Nash Reviewed-by: Ziran Sun --- resource/csdk/stack/test/cbortests.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resource/csdk/stack/test/cbortests.cpp b/resource/csdk/stack/test/cbortests.cpp index ed270bb..3518245 100644 --- a/resource/csdk/stack/test/cbortests.cpp +++ b/resource/csdk/stack/test/cbortests.cpp @@ -84,7 +84,7 @@ TEST_F(CborByteStringTest, ByteStringSetGetTest) OCByteString quakedata_out = { NULL, 0}; ASSERT_EQ(true, OCRepPayloadGetPropByteString(payload_in, "quakedata", &quakedata_out)); - + ASSERT_NE((uint8_t*)NULL, quakedata_out.bytes); EXPECT_EQ(quakedata_in.len, quakedata_out.len); EXPECT_EQ(0, memcmp(quakedata_in.bytes, quakedata_out.bytes, quakedata_in.len)); @@ -127,6 +127,7 @@ TEST_F(CborByteStringTest, ByteStringConvertParseTest) ASSERT_EQ(true, OCRepPayloadGetPropByteString((OCRepPayload*)payload_out, "quakedata", &quakedata_out)); // Compare input and output data + ASSERT_NE((uint8_t*)NULL, quakedata_out.bytes); EXPECT_EQ(quakedata_in.len, quakedata_out.len); EXPECT_EQ(0, memcmp(quakedata_in.bytes, quakedata_out.bytes, quakedata_in.len)); -- 2.7.4