diff options
author | Collin <iCollin@users.noreply.github.com> | 2020-05-11 14:14:42 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-11 17:14:42 -0400 |
commit | bfacfcb45b067b987cc38b98fe70657559c330ed (patch) | |
tree | d40cbb9f7a2be77056b5e80742288ea1ed46d73b | |
parent | 902144c5e0f9321115274e77f16c8ee33a4f1acb (diff) | |
download | sdl_core-bfacfcb45b067b987cc38b98fe70657559c330ed.tar.gz |
Fix Compile Warnings (#3356)
* fix warning:maybe-uninitialized in CStringToEnum
* fix out of buffer write warning in unit tests
* Apply suggestions from code review
-rw-r--r-- | src/components/smart_objects/include/smart_objects/enum_schema_item.h | 3 | ||||
-rw-r--r-- | src/components/smart_objects/test/SmartObjectUnit_test.cc | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/components/smart_objects/include/smart_objects/enum_schema_item.h b/src/components/smart_objects/include/smart_objects/enum_schema_item.h index 053ad98395..7fa5a65b35 100644 --- a/src/components/smart_objects/include/smart_objects/enum_schema_item.h +++ b/src/components/smart_objects/include/smart_objects/enum_schema_item.h @@ -203,6 +203,9 @@ class EnumConversionHelper { typename CStringToEnumMap::const_iterator it = cstring_to_enum_map().find(str); if (it == cstring_to_enum_map().end()) { + if (value) { + *value = EnumType::INVALID_ENUM; + } return false; } if (value) { diff --git a/src/components/smart_objects/test/SmartObjectUnit_test.cc b/src/components/smart_objects/test/SmartObjectUnit_test.cc index 72f96ef939..4a2fadfbe9 100644 --- a/src/components/smart_objects/test/SmartObjectUnit_test.cc +++ b/src/components/smart_objects/test/SmartObjectUnit_test.cc @@ -43,7 +43,7 @@ using namespace ns_smart_device_link::ns_smart_objects; class TestHelper : public ::testing::Test { protected: void makeMapObject(SmartObject& obj, const int size) const { - char i_key[8], j_key[8], k_key[8], value[8]; + char i_key[32], j_key[32], k_key[32], value[32]; for (int i = 0; i < size; i++) for (int j = 0; j < size; j++) @@ -57,7 +57,7 @@ class TestHelper : public ::testing::Test { } void checkMapObject(SmartObject& obj, const int size) const { - char i_key[8], j_key[8], k_key[8], value[8]; + char i_key[32], j_key[32], k_key[32], value[32]; for (int i = 0; i < size; i++) for (int j = 0; j < size; j++) |