svf-tools 1.0.720 → 1.0.722

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.720",
+  "version": "1.0.722",
   "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/include/SABER/SrcSnkDDA.h

@@ -243,6 +243,11 @@ public:
         return saberCondAllocator.get();
     }
 
+    inline const SVFBugReport& getBugReport() const
+    {
+        return report;
+    }
+
 protected:
     /// Forward traverse
     inline void FWProcessCurNode(const DPIm& item) override

package/svf/include/Util/SVFBugReport.h

@@ -84,6 +84,7 @@ public:
 
 public:
     enum BugType {FULLBUFOVERFLOW, PARTIALBUFOVERFLOW, NEVERFREE, PARTIALLEAK, DOUBLEFREE, FILENEVERCLOSE, FILEPARTIALCLOSE};
+    static const std::map<GenericBug::BugType, std::string> BugType2Str;
 
 protected:
     BugType bugType;
@@ -355,7 +356,17 @@ public:
      * function: pass file path, open the file and dump bug report as JSON format
      * usage: dumpToFile("/path/to/file")
      */
-    void dumpToJsonFile(const std::string& filePath);
+    void dumpToJsonFile(const std::string& filePath) const;
+
+    /*
+     * function: get underlying bugset
+     * usage: getBugSet()
+     */
+    const BugSet &getBugSet() const
+    {
+        return bugSet;
+    }
+
 };
 }
 

package/svf/lib/Util/SVFBugReport.cpp

@@ -35,6 +35,17 @@
 using namespace std;
 using namespace SVF;
 
+const std::map<GenericBug::BugType, std::string> GenericBug::BugType2Str =
+{
+    {GenericBug::FULLBUFOVERFLOW, "Full Buffer Overflow"},
+    {GenericBug::PARTIALBUFOVERFLOW, "Partial Buffer Overflow"},
+    {GenericBug::NEVERFREE, "Never Free"},
+    {GenericBug::PARTIALLEAK, "Partial Leak"},
+    {GenericBug::FILENEVERCLOSE, "File Never Close"},
+    {GenericBug::FILEPARTIALCLOSE, "File Partial Close"},
+    {GenericBug::DOUBLEFREE, "Double Free"}
+};
+
 const std::string GenericBug::getLoc() const
 {
     const SVFBugEvent&sourceInstEvent = bugEventStack.at(bugEventStack.size() -1);
@@ -299,7 +310,7 @@ SVFBugReport::~SVFBugReport()
     }
 }
 
-void SVFBugReport::dumpToJsonFile(const std::string& filePath)
+void SVFBugReport::dumpToJsonFile(const std::string& filePath) const
 {
     std::map<u32_t, std::string> eventType2Str =
     {
@@ -309,17 +320,6 @@ void SVFBugReport::dumpToJsonFile(const std::string& filePath)
         {SVFBugEvent::Branch, "branch"}
     };
 
-    std::map<GenericBug::BugType, std::string> bugType2Str =
-    {
-        {GenericBug::FULLBUFOVERFLOW, "Full Buffer Overflow"},
-        {GenericBug::PARTIALBUFOVERFLOW, "Partial Buffer Overflow"},
-        {GenericBug::NEVERFREE, "Never Free"},
-        {GenericBug::PARTIALLEAK, "Partial Leak"},
-        {GenericBug::FILENEVERCLOSE, "File Never Close"},
-        {GenericBug::FILEPARTIALCLOSE, "File Partial Close"},
-        {GenericBug::DOUBLEFREE, "Double Free"}
-    };
-
     ofstream jsonFile(filePath, ios::out);
 
     jsonFile << "[";
@@ -330,7 +330,7 @@ void SVFBugReport::dumpToJsonFile(const std::string& filePath)
         cJSON *singleBug = cJSON_CreateObject();
 
         /// add bug information to json
-        cJSON *bugType = cJSON_CreateString(bugType2Str[bugPtr->getBugType()].c_str());
+        cJSON *bugType = cJSON_CreateString(GenericBug::BugType2Str.at(bugPtr->getBugType()).c_str());
         cJSON_AddItemToObject(singleBug, "DefectType", bugType);
 
         cJSON *bugLoc = cJSON_Parse(bugPtr->getLoc().c_str());

package/svf-llvm/lib/LLVMModule.cpp

@@ -1057,8 +1057,9 @@ StInfo* LLVMModuleSet::collectArrayInfo(const ArrayType* ty)
     /// Array's flatten field infor is the same as its element's
     /// flatten infor.
     StInfo* elemStInfo = collectTypeInfo(elemTy);
-    u32_t nfE = elemStInfo->getNumOfFlattenFields();
-    for (u32_t j = 0; j < nfE; j++)
+    u32_t nfF = elemStInfo->getNumOfFlattenFields();
+    u32_t nfE = elemStInfo->getNumOfFlattenElements();
+    for (u32_t j = 0; j < nfF; j++)
     {
         const SVFType* fieldTy = elemStInfo->getFlattenFieldTypes()[j];
         stInfo->getFlattenFieldTypes().push_back(fieldTy);
@@ -1077,14 +1078,14 @@ StInfo* LLVMModuleSet::collectArrayInfo(const ArrayType* ty)
     {
         for (u32_t j = 0; j < nfE; ++j)
         {
-            const SVFType* et = elemStInfo->getFlattenFieldTypes()[j];
+            const SVFType* et = elemStInfo->getFlattenElementTypes()[j];
             stInfo->getFlattenElementTypes().push_back(et);
         }
     }
 
     assert(stInfo->getFlattenElementTypes().size() == nfE * totalElemNum &&
            "typeForArray size incorrect!!!");
-    stInfo->setNumOfFieldsAndElems(nfE, nfE * totalElemNum);
+    stInfo->setNumOfFieldsAndElems(nfF, nfE * totalElemNum);
 
     return stInfo;
 }
@@ -1112,23 +1113,22 @@ StInfo* LLVMModuleSet::collectStructInfo(const StructType* structTy,
         if (SVFUtil::isa<StructType, ArrayType>(elemTy))
         {
             StInfo* subStInfo = collectTypeInfo(elemTy);
-            u32_t nfE = subStInfo->getNumOfFlattenFields();
+            u32_t nfF = subStInfo->getNumOfFlattenFields();
+            u32_t nfE = subStInfo->getNumOfFlattenElements();
             // Copy ST's info, whose element 0 is the size of ST itself.
-            for (u32_t j = 0; j < nfE; ++j)
+            for (u32_t j = 0; j < nfF; ++j)
             {
                 const SVFType* elemTy = subStInfo->getFlattenFieldTypes()[j];
                 stInfo->getFlattenFieldTypes().push_back(elemTy);
             }
-            numFields += nfE;
-            strideOffset += nfE * subStInfo->getStride();
-            for (u32_t tpi = 0; tpi < subStInfo->getStride(); ++tpi)
+            numFields += nfF;
+            strideOffset += nfE;
+            for (u32_t tpj = 0; tpj < nfE; ++tpj)
             {
-                for (u32_t tpj = 0; tpj < nfE; ++tpj)
-                {
-                    const SVFType* ty = subStInfo->getFlattenFieldTypes()[tpj];
-                    stInfo->getFlattenElementTypes().push_back(ty);
-                }
+                const SVFType* ty = subStInfo->getFlattenElementTypes()[tpj];
+                stInfo->getFlattenElementTypes().push_back(ty);
             }
+
         }
         else
         {