Add user input validation to prevent out-of-bound access.

Adresses DSO-14405
IntelRealSense · Feb 6, 2020 · 183c87d · 183c87d
1 parent 8c616ea
commit 183c87d
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/tools/fw-logger/string-formatter.cpp b/tools/fw-logger/string-formatter.cpp
@@ -4,6 +4,7 @@
 #include <regex>
 #include <sstream>
 #include <iomanip>
+#include <iostream>
 
 using namespace std;
 
@@ -99,7 +100,14 @@ namespace fw_logger
                     {
                         auto vec = _enums[enum_name];
                         regex e3 = e;
-                        auto res1 = regex_replace(back_inserter(destTemp), source_temp.begin(), source_temp.end(), e3, vec[exp_replace_it->second]);
+                        // Validate user's input is within the enumerated values
+                        if (exp_replace_it->second >=0 && exp_replace_it->second <vec.size())
+                            auto res1 = regex_replace(back_inserter(destTemp), source_temp.begin(), source_temp.end(), e3, vec[exp_replace_it->second]);
+                        else
+                        {
+                            std::cout << "Protocol Error recognized!\nImproper log message received: " << source_temp
+                                << ", invalid parameter: " << exp_replace_it->second << std::endl;
+                        }
                         source_temp = destTemp;
                     }
                 }