Merge topic 'fix-crash'

92001e4e Fix a crash due to bad STL iterage.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: T.J. Corona <tj.corona@kitware.com>
Merge-request: !1469

smtk/operation/groups/ExporterGroup.cxx

@@ -42,11 +42,15 @@ std::set<Operation::Index> ExporterGroup::operationsForResourceAndFileName(
 void ExporterGroup::filterOperationsThatRejectFileName(
   std::set<Operation::Index>& ops, const std::string& fileName) const
 {
-  for (auto index = ops.begin(); index != ops.end(); ++index)
+  for (auto index = ops.begin(); index != ops.end();)
   {
     if (fileItemDefinitionForOperation(*index)->isValueValid(fileName) == false)
     {
-      ops.erase(index);
+      ops.erase(index++);
+    }
+    else
+    {
+      ++index;
     }
   }
 }

smtk/operation/groups/ImporterGroup.cxx

@@ -42,11 +42,15 @@ std::set<Operation::Index> ImporterGroup::operationsForResourceAndFileName(
 void ImporterGroup::filterOperationsThatRejectFileName(
   std::set<Operation::Index>& ops, const std::string& fileName) const
 {
-  for (auto index = ops.begin(); index != ops.end(); ++index)
+  for (auto index = ops.begin(); index != ops.end();)
   {
     if (fileItemDefinitionForOperation(*index)->isValueValid(fileName) == false)
     {
-      ops.erase(index);
+      ops.erase(index++);
+    }
+    else
+    {
+      ++index;
     }
   }
 }