summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJackLivio <jack@livio.io>2018-08-08 10:02:03 -0400
committerJackLivio <jack@livio.io>2018-08-08 10:02:03 -0400
commit5f651c9e75441633c4e489d81b09900d1457bfb1 (patch)
tree96dca261455d16504bfc89b9890857aa1fc3050d
parent564a5ccc9bd457623b9a963cf7680f97342615ef (diff)
downloadsdl_core-5f651c9e75441633c4e489d81b09900d1457bfb1.tar.gz
Make sure iterator is valid
-rw-r--r--src/components/smart_objects/src/object_schema_item.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/components/smart_objects/src/object_schema_item.cc b/src/components/smart_objects/src/object_schema_item.cc
index f2ec3b088c..d046e49bcd 100644
--- a/src/components/smart_objects/src/object_schema_item.cc
+++ b/src/components/smart_objects/src/object_schema_item.cc
@@ -328,11 +328,12 @@ void CObjectSchemaItem::RemoveFakeParams(
key.compare(app_id) != 0) {
++it;
Object.erase(key);
- } else if (members_it->second.mIsRemoved &&
+ } else if (mMembers.end() != members_it && members_it->second.mIsRemoved &&
members_it->second.CheckHistoryFieldVersion(MessageVersion)) {
++it;
Object.erase(key);
- } else if (members_it->second.mHistoryVector.size() > 0) {
+ } else if (mMembers.end() != members_it &&
+ members_it->second.mHistoryVector.size() > 0) {
for (uint i = 0; i < members_it->second.mHistoryVector.size(); i++) {
if (members_it->second.mHistoryVector[i].CheckHistoryFieldVersion(
MessageVersion) &&