Changeset 18833 for trunk/FACT++

Timestamp:

04/14/17 20:58:01 (8 years ago)

Author:

tbretz

Message:

Secured Tools::Split against exceptions from boost::tokenize

Location:

trunk/FACT++/src

Files:

• InterpreterV8.cc (modified) (1 diff)
• Readline.cc (modified) (1 diff)

trunk/FACT++/src/InterpreterV8.cc

@@ -1696 +1696 @@
 
     string irq = p==string::npos?str:str.substr(0, p);
-    const map<string,string> data = Tools::Split(irq, true);
+
+    map<string,string> data;
+    try
+    {
+        data = Tools::Split(irq, true);
+    }
+    catch (const exception &e)
+    {
+        irq = "ERROR";
+        data["0"] = e.what();
+        JsWarn("Couldn't parse interrupt: "+irq+" ["+string(e.what())+"]");
+    }
 
     Local<Value>  irq_str = String::New(irq.c_str());

trunk/FACT++/src/Readline.cc

@@ -1370 +1370 @@
 void Readline::ProcessLine(const string &str)
 {
-    const string cmd = Tools::Uncomment(str);
-
-    if (!cmd.empty())
-    {
-        const bool rc = PreProcess(cmd);
-
-        AddToHistory(cmd);
-
-        if (rc)
-            return;
-
-        fLine++;
-    }
-
-    fCommandLog << str << endl;
+    try
+    {
+        const string cmd = Tools::Uncomment(str);
+
+        if (!cmd.empty())
+        {
+            const bool rc = PreProcess(cmd);
+
+            AddToHistory(cmd);
+
+            if (rc)
+                return;
+
+            fLine++;
+        }
+
+        fCommandLog << str << endl;
+    }
+    catch (const exception &e)
+    {
+        PrintReadlineError("Couldn't parse: "+str+" ["+string(e.what())+"]");
+    }
 }