svf-tools 1.0.558 → 1.0.559

package/lib/Util/ExtAPI.cpp

@@ -307,7 +307,7 @@ std::vector<ExtAPI::Operation> ExtAPI::getAllOperations(std::string funName)
     {
         cJSON *obj = item->child;
         //  Get the first operation of the function
-        obj = obj -> next -> next;
+        obj = obj -> next -> next -> next -> next;
         std::vector<ExtAPI::Operation *> operations;
         while (obj)
         {
@@ -358,7 +358,7 @@ ExtAPI::extType ExtAPI::get_type(const std::string& funName)
     if (item != nullptr)
     {
         //  Get the first operation of the function
-        cJSON *obj = item->child;
+        cJSON *obj = item->child->next->next;
         if (strcmp(obj->string, JSON_OPT_FUNCTIONTYPE) == 0)
             type = obj->valuestring;
         else
@@ -387,7 +387,7 @@ u32_t ExtAPI::isOverwrittenAppFunction(const SVF::SVFFunction *callee)
     if (item != nullptr)
     {
         cJSON *obj = item->child;
-        obj = obj->next;
+        obj = obj->next->next->next;
         if (strcmp(obj->string, JSON_OPT_OVERWRITE) == 0)
             return obj->valueint;
         else
@@ -473,6 +473,42 @@ bool ExtAPI::is_realloc(const SVFFunction *F)
     return t == EFT_REALLOC;
 }
 
+// Does (F) have the same return type(pointer or nonpointer) and same number of arguments
+bool ExtAPI::is_sameSignature(const SVFFunction *F)
+{
+    cJSON *item = get_FunJson(F->getName());
+    // If return type is pointer
+    bool isPointer = false;
+    // The number of arguments
+    u32_t argNum = 0;
+    if (item != nullptr)
+    {
+        // Get the "return" attribute
+        cJSON *obj = item->child;
+        if (strlen(obj->valuestring) == 0) // e.g. "return":  ""
+            assert(false && "'return' should not be empty!");
+        // If "return": "..." includes "*", the return type of extern function is a pointer
+        if (strstr(obj->valuestring, "*") != NULL)
+            isPointer = true;
+        // Get the "arguments" attribute
+        obj = obj -> next;
+        if (strlen(obj->valuestring) == 0) // e.g. "arguments":  "",
+            assert(false && "'arguments' should not be empty!");
+        // If "arguments":  "()", the number of arguments is 0, otherwise, number >= 1;
+        if (strcmp(obj->valuestring, "()") != 0)
+        {
+            argNum++;
+            for (u32_t i = 0; i < strlen(obj->valuestring); i++)
+                if (obj->valuestring[i] == ',') // Calculate the number of arguments based on the number of ","
+                    argNum++;
+        }
+    }
+    if (F->arg_size() != argNum) // The number of arguments is different
+        return false;
+    // Is the return type the same?
+    return F->getLLVMFun()->getReturnType()->isPointerTy() == isPointer;
+}
+
 // Should (F) be considered "external" (either not defined in the program
 //   or a user-defined version of a known alloc or no-op)?
 bool ExtAPI::is_ext(const SVFFunction *F)
@@ -489,9 +525,11 @@ bool ExtAPI::is_ext(const SVFFunction *F)
         if (t != EFT_NULL)
         {
             u32_t overwrittenAppFunction = isOverwrittenAppFunction(F);
+            if (!is_sameSignature(F))
+                res = 0;
             // overwrittenAppFunction = 1: Execute function specification in ExtAPI.json
             // F is considered as external function
-            if (overwrittenAppFunction == 1)
+            else if (overwrittenAppFunction == 1)
                 res = 1;
             // overwrittenAppFunction = 0: Execute user-defined functions
             // F is not considered as external function

package/package.json

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