svf-tools 1.0.1274 → 1.0.1276

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.1274",
+  "version": "1.0.1276",
   "description": "* <b>[TypeClone](https://github.com/SVF-tools/SVF/wiki/TypeClone) published in our [ECOOP paper](https://yuleisui.github.io/publications/ecoop20.pdf) is now available in SVF </b> * <b>SVF now uses a single script for its build. Just type [`source ./build.sh`](https://github.com/SVF-tools/SVF/blob/master/build.sh) in your terminal, that's it!</b> * <b>SVF now supports LLVM-10.0.0! </b> * <b>We thank [bsauce](https://github.com/bsauce) for writing a user manual of SVF ([link1](https://www.jianshu.com/p/068a08ec749c) and [link2](https://www.jianshu.com/p/777c30d4240e)) in Chinese </b> * <b>SVF now supports LLVM-9.0.0 (Thank [Byoungyoung Lee](https://github.com/SVF-tools/SVF/issues/142) for his help!). </b> * <b>SVF now supports a set of [field-sensitive pointer analyses](https://yuleisui.github.io/publications/sas2019a.pdf). </b> * <b>[Use SVF as an external lib](https://github.com/SVF-tools/SVF/wiki/Using-SVF-as-a-lib-in-your-own-tool) for your own project (Contributed by [Hongxu Chen](https://github.com/HongxuChen)). </b> * <b>SVF now supports LLVM-7.0.0. </b> * <b>SVF now supports Docker. [Try SVF in Docker](https://github.com/SVF-tools/SVF/wiki/Try-SVF-in-Docker)! </b> * <b>SVF now supports [LLVM-6.0.0](https://github.com/svf-tools/SVF/pull/38) (Contributed by [Jack Anthony](https://github.com/jackanth)). </b> * <b>SVF now supports [LLVM-4.0.0](https://github.com/svf-tools/SVF/pull/23) (Contributed by Jared Carlson. Thank [Jared](https://github.com/jcarlson23) and [Will](https://github.com/dtzWill) for their in-depth [discussions](https://github.com/svf-tools/SVF/pull/18) about updating SVF!) </b> * <b>SVF now supports analysis for C++ programs.</b> <br />",
   "main": "index.js",
   "scripts": {

package/svf/lib/Util/ExtAPI.cpp

@@ -71,50 +71,68 @@ bool ExtAPI::setExtBcPath(const std::string& path)
     return false;
 }
 
-// Get environment variables $SVF_DIR and "npm root" through popen() method
+// Get stdout from a shell command.
+// Return empty string if the command fails.
 static std::string GetStdoutFromCommand(const std::string& command)
 {
     char buffer[128];
-    std::string result = "";
-    // Open pipe to file
+    std::string result;
+
     FILE* pipe = popen(command.c_str(), "r");
     if (!pipe)
+        return "";
+
+    while (fgets(buffer, sizeof(buffer), pipe) != nullptr)
     {
-        return "popen failed!";
-    }
-    // read till end of process:
-    while (!feof(pipe))
-    {
-        // use buffer to read and add to result
-        if (fgets(buffer, 128, pipe) != NULL)
-            result += buffer;
+        result += buffer;
     }
-    pclose(pipe);
-    // remove "\n"
-    result.erase(remove(result.begin(), result.end(), '\n'), result.end());
+
+    int status = pclose(pipe);
+    if (status != 0)
+        return "";
+
+    // remove trailing newlines
+    result.erase(std::remove(result.begin(), result.end(), '\n'), result.end());
+    result.erase(std::remove(result.begin(), result.end(), '\r'), result.end());
+
     return result;
 }
 
-// Get extapi.bc file path in npm
+// Get extapi.bc file path from SVF_DIR or npm installation
 static std::string getFilePath(const std::string& path)
 {
-    std::string bcFilePath = "";
-    if (path.compare("SVF_DIR") == 0)
+    std::string bcFilePath;
+
+    if (path == "SVF_DIR")
     {
-        char const* svfdir = getenv("SVF_DIR");
-        if (svfdir)
-            bcFilePath = svfdir;
+        const char* svfdir = getenv("SVF_DIR");
+        if (!svfdir)
+            return "";
+
+        bcFilePath = svfdir;
+
         if (!bcFilePath.empty() && bcFilePath.back() != '/')
             bcFilePath.push_back('/');
-        bcFilePath.append(SVF_BUILD_TYPE "-build").append("/lib/extapi.bc");
+
+        bcFilePath.append(SVF_BUILD_TYPE "-build/lib/extapi.bc");
     }
-    else if (path.compare("npm root") == 0)
+    else if (path == "npm root")
     {
-        bcFilePath = GetStdoutFromCommand(path);
-        if (!bcFilePath.empty() && bcFilePath.back() != '/')
+        // Check npm exists before calling `npm root`.
+        // If npm is missing, this command returns empty.
+        bcFilePath = GetStdoutFromCommand(
+                         "command -v npm >/dev/null 2>&1 && npm root"
+                     );
+
+        if (bcFilePath.empty())
+            return "";
+
+        if (bcFilePath.back() != '/')
             bcFilePath.push_back('/');
+
         bcFilePath.append("SVF/lib/extapi.bc");
     }
+
     return bcFilePath;
 }
 
@@ -180,13 +198,14 @@ std::string ExtAPI::getExtBcPath()
     }
 
     // 5. Use npm root + standard relative path (for npm installations)
-    if (setExtBcPath(getFilePath("npm root")))
+    std::string npmPath = getFilePath("npm root");
+    if (setExtBcPath(npmPath))
     {
         return extBcPath;
     }
     else
     {
-        candidatePaths.push_back(getFilePath("npm root"));
+        candidatePaths.push_back(npmPath.empty() ? "npm root unavailable" : npmPath);
     }
 
     // 6. Use the directory of the loaded libSVFCore.so/.dylib + extapi.bc