Add more run-time checks to the ABAQUS reader.

Coverity complains about the use of the unchecked indices 'elid_start'
and 'elid_end' in the loop after reading them from an untrusted file.
Check at least their basic integrity. While there, also check that
commas are really commas.

diff --git a/source/grid/grid_in.cc b/source/grid/grid_in.cc
index a24174e4acf25896742475d63c1820e79c020bc9..578938b8a1815badaf1c9bdd2f90e2a9febfa024 100644 (file)
--- a/source/grid/grid_in.cc
+++ b/source/grid/grid_in.cc
@@ -3224,6 +3224,8 @@ GridIn<dim, spacedim>::get_format_names()
   return "dbmesh|msh|unv|vtk|ucd|abaqus|xda|netcdf|tecplot|assimp";
 }
 
+
+
 namespace
 {
   template <int dim, int spacedim>
@@ -3234,6 +3236,8 @@ namespace
     AssertThrow(spacedim == 2 || spacedim == 3, ExcNotImplemented());
   }
 
+
+
   // Convert from a string to some other data type
   // Reference: http://www.codeguru.com/forum/showthread.php?t=231054
   template <class T>
@@ -3244,6 +3248,8 @@ namespace
     return !(iss >> f >> t).fail();
   }
 
+
+
   // Extract an integer from a string
   int
   extract_int(const std::string &s)
@@ -3262,6 +3268,8 @@ namespace
     return number;
   }
 
+
+
   template <int dim, int spacedim>
   void
   Abaqus_to_UCD<dim, spacedim>::read_in_abaqus(std::istream &input_stream)
@@ -3486,19 +3494,41 @@ namespace
                 char               comma;
                 int                elid_start;
                 int                elid_end;
-                int                elis_step =
-                  1; // Default value set in case stride not provided
+                int elis_step = 1; // Default if case stride not provided
+
                 // Some files don't have the stride size
                 // Compare mesh test cases ./grids/abaqus/3d/other_simple.inp to
                 // ./grids/abaqus/2d/2d_test_abaqus.inp
                 iss >> elid_start >> comma >> elid_end;
+                AssertThrow(comma == ',',
+                            ExcMessage(
+                              std::string(
+                                "While reading an ABAQUS file, the reader "
+                                "expected a comma but found a <") +
+                              comma + "> in the line <" + line + ">."));
+                AssertThrow(
+                  elid_start <= elid_end,
+                  ExcMessage(
+                    std::string(
+                      "While reading an ABAQUS file, the reader encountered "
+                      "a GENERATE statement in which the upper bound <") +
+                    Utilities::int_to_string(elid_end) +
+                    "> for the element numbers is not larger or equal "
+                    "than the lower bound <" +
+                    Utilities::int_to_string(elid_start) + ">."));
+
                 // https://stackoverflow.com/questions/8046357/how-do-i-check-if-a-stringstream-variable-is-empty-null
                 if (iss.rdbuf()->in_avail() != 0)
                   iss >> comma >> elis_step;
+                AssertThrow(comma == ',',
+                            ExcMessage(
+                              std::string(
+                                "While reading an ABAQUS file, the reader "
+                                "expected a comma but found a <") +
+                              comma + "> in the line <" + line + ">."));
+
                 for (int i = elid_start; i <= elid_end; i += elis_step)
-                  {
-                    elements.push_back(i);
-                  }
+                  elements.push_back(i);
                 elsets_list[elset_name] = elements;
 
                 std::getline(input_stream, line);
@@ -3518,6 +3548,14 @@ namespace
                     while (!iss.eof())
                       {
                         iss >> elid >> comma;
+                        AssertThrow(
+                          comma == ',',
+                          ExcMessage(
+                            std::string(
+                              "While reading an ABAQUS file, the reader "
+                              "expected a comma but found a <") +
+                            comma + "> in the line <" + line + ">."));
+
                         elements.push_back(elid);
                       }