Changeset 19582 for trunk/FACT++

Timestamp:

09/01/19 11:18:48 (5 years ago)

Author:

tbretz

Message:

Added a missing sanity check in the $ function, use dereferencing rather than string().c_str() for paths.

File:

• trunk/FACT++/src/InterpreterV8.cc (modified) (4 diffs)

trunk/FACT++/src/InterpreterV8.cc

@@ -750 +750 @@
     const auto f = path.is_absolute() ? path : boost::filesystem::path(fIncludePath)/path;
 
-    izstream fin(f.string().c_str());
+    izstream fin(*file);//f.string().c_str());
     if (!fin)
         return ThrowException(String::New(errno!=0?strerror(errno):"Insufficient memory for decompression"));
@@ -789 +789 @@
     const auto f = path.is_absolute() ? path : boost::filesystem::path(fIncludePath)/path;
 
-    izstream fin(f.string().c_str());
+    izstream fin(*file);//f.string().c_str());
     if (!fin)
         return ThrowException(String::New(errno!=0?strerror(errno):"Insufficient memory for decompression"));
@@ -2607 +2607 @@
                 "}"
                 ""
-                "val = typeof(val)=='object' ? JSON.stringify(val) : val.toString(base);"
+                "val = val==undefined || typeof(val)=='object' ? JSON.stringify(val) : val.toString(base);"
                 ""
                 "var sz = parseInt(p1); /* padding size */"
@@ -2813 +2813 @@
         else
         {
-            fIncludePath = boost::filesystem::path(filename).parent_path().string();
-
             // We call script->Run because it is the only way to
             // catch exceptions.