size check

Signed-off-by: Dharini Dutia <[email protected]>
gazebosim · Jan 9, 2024 · 5a4c1aa · 5a4c1aa
1 parent 404ffef
commit 5a4c1aa
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/src/rendering/MaterialParser/ConfigLoader.cc b/src/rendering/MaterialParser/ConfigLoader.cc
@@ -23,7 +23,6 @@
 #include <utility>
 #include <vector>
 
-#include <gz/common/Console.hh>
 #include <gz/common/Filesystem.hh>
 #include "gz/sim/InstallationDirectories.hh"
 

diff --git a/src/rendering/MaterialParser/ConfigLoader.hh b/src/rendering/MaterialParser/ConfigLoader.hh
@@ -25,6 +25,8 @@
 #include <string>
 #include <vector>
 
+#include <gz/common/Console.hh>
+
 namespace gz
 {
 namespace sim
@@ -118,6 +120,9 @@ public:
     for (const auto & str : m_values) {
       floatValues.push_back(std::stof(str));
     }
+    if (floatValues.size() < 3) {
+      gzerr << "Bad material file." << std::endl;
+    }
   }
 
   inline const std::string & getValue(unsigned int index = 0)

diff --git a/src/rendering/MaterialParser/MaterialParser.cc b/src/rendering/MaterialParser/MaterialParser.cc
@@ -51,7 +51,7 @@ std::optional<MaterialParser::MaterialValues> MaterialParser::GetMaterialValues(
   for (it = scripts.begin(); it != scripts.end(); ++it) {
     std::string name = it->first;
     if (name.find(material) != std::string::npos) {
-      if(!values) {
+      if (!values) {
         values = MaterialValues();
       }
       ConfigNode * node = it->second;