svf-tools 1.0.487 → 1.0.488

package/lib/Util/ExtAPI.cpp

@@ -69,70 +69,64 @@ std::string ExtAPI::get_name(const SVFFunction *F)
     return funName;
 }
 
+// Get environment variables $SVF_DIR and "npm root" through popen() method
 std::string GetStdoutFromCommand(std::string command)
 {
     char buffer[128];
     std::string result = "";
-
     // Open pipe to file
     FILE *pipe = popen(command.c_str(), "r");
     if (!pipe)
     {
         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;
     }
-
     pclose(pipe);
     // remove "\n"
     result.erase(remove(result.begin(), result.end(), '\n'), result.end());
     return result;
 }
 
-// Get ExtAPI.json
+// Get ExtAPI.json file
 FILE *getJsonFile(std::string path)
 {
     std::string jsonFilePath = GetStdoutFromCommand(path);
     if (path.compare("npm root") == 0)
     {
-        std::string json_path = "";
         int os_flag = 1;
+        // SVF installed via npm needs to determine the type of operating system, otherwise the ExtAPI.json path may not be found
+        // Linux os
 #ifdef linux
         os_flag = 0;
-        json_path = "/svf-lib/SVF-linux";
+        jsonFilePath.append("/svf-lib/SVF-linux");
 #endif
+        // Mac os
         if (os_flag == 1)
         {
-            json_path = "/svf-lib/SVF-osx";
+            jsonFilePath.append("/svf-lib/SVF-osx");
         }
-        jsonFilePath.append(json_path);
     }
     jsonFilePath.append(EXTAPI_JSON_PATH);
     FILE *file = nullptr;
     file = fopen(jsonFilePath.c_str(), "r");
-    if (file != nullptr)
-    {
-        return file;
-    }
-    else
-    {
-        return nullptr;
-    }
+    return file;
 }
 
 // Get specifications of external functions in ExtAPI.json file
 cJSON *ExtAPI::get_FunJson(const std::string funName)
 {
-
     if (!root)
     {
+        // Three ways to get ExtAPI.json path
+        // 1. default path(get ExtAPI.json path from Util/config.h)
+        // 2. from $SVF_DIR
+        // 3. from "npm root"(If SVF is installed via npm)
         std::string jsonFilePath = PROJECT_PATH;
         jsonFilePath.append(EXTAPI_JSON_PATH);
         // open file
@@ -146,7 +140,7 @@ cJSON *ExtAPI::get_FunJson(const std::string funName)
                 file = getJsonFile("npm root");
                 if (file == nullptr)
                 {
-                    assert(false && "Open Json file fails!");
+                    assert(false && "Open ExtAPI.json file fails!");
                     return nullptr;
                 }
             }
@@ -164,7 +158,7 @@ cJSON *ExtAPI::get_FunJson(const std::string funName)
         u32_t size = fread(jsonStr, sizeof(char), fileSize, file);
         if (size == 0)
         {
-            assert("read Json file fails!");
+            assert(false && "Read ExtAPI.json file fails!");
             return nullptr;
         }
         fclose(file);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.487",
+  "version": "1.0.488",
   "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": {