Merge branch 'natch'

ispras · Aug 17, 2023 · a501649 · a501649
2 parents ba86e27 + 244d58f
commit a501649
Show file tree

Hide file tree

Showing 19 changed files with 3,701 additions and 189 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -81,3 +81,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ## 20230522
 - Fix error in generator
 - Add generation for pugi::char_t *&
+
+## 20230711
+- Support generation fuzz driver for Natch data: https://github.com/thientc/Futag-tests/tree/main/Natch
+
+## 20230807
+- Optimize ConsumerBuilder
+- Add example for context-generation https://github.com/thientc/Futag-tests/tree/main/json-c-contexts
diff --git a/futag-work.png b/futag-work.png
diff --git a/src/Checkers/lib/FutagAnalyzer.cpp b/src/Checkers/lib/FutagAnalyzer.cpp
@@ -2,7 +2,7 @@
  * @file FutagAnalyzer.cpp
  * @author Tran Chi Thien (thientcgithub@gmail.com)
  * @brief
- * @version 2.0.4
+ * @version 2.0.5
  * @date 2023-04-17
  *
  * @copyright Copyright (c) 2023

diff --git a/src/Checkers/lib/FutagConsumerAnalyzer.cpp b/src/Checkers/lib/FutagConsumerAnalyzer.cpp
@@ -2,7 +2,7 @@
  * @file FutagConsumerAnalyzer.cpp
  * @author Tran Chi Thien
  * @brief 
- * @version 2.0.4
+ * @version 2.0.5
  * @date 2023-04-17
  * 
  * @copyright Copyright (c) 2023
@@ -516,6 +516,10 @@ void FutagConsumerAnalyzer::AnalyzeVisitedFunctionDecl(
         llvm::outs() << "[Futag]: Print contexts\n";
         // Build the CFG of current function
         CFG *cfg = Mgr.getCFG(func);
+        //To speed up the analyzer for normal computer, we analyze only simple functions with number of block in CFG <= 30
+        if(cfg->size() > 30) {
+            return ;
+        }
         if (!cfg) {
             llvm::outs() << "-- Empty CFG for function: "
                          << func->getNameAsString() << "\n";

diff --git a/src/clang/lib/Futag/Basic.cpp b/src/clang/lib/Futag/Basic.cpp
@@ -13,7 +13,7 @@
  *             a tool of ISP RAS                *
  ************************************************
  *
- * @version 2.0.4
+ * @version 2.0.5
  * @date 2023-04-17
  *
  * @copyright This file is distributed under the GPL v3 license

diff --git a/src/clang/lib/Futag/ConsumerFinder.cpp b/src/clang/lib/Futag/ConsumerFinder.cpp
@@ -2,7 +2,7 @@
  * @file ConsumerFinder.cpp
  * @author Tran Chi Thien
  * @brief This file contains functions for analyzing consumer program
- * @version 2.0.4
+ * @version 2.0.5
  * @date 2023-04-17
  * 
  * @copyright Copyright (c) 2023

diff --git a/src/clang/lib/Futag/MatchFinder.cpp b/src/clang/lib/Futag/MatchFinder.cpp
@@ -2,7 +2,7 @@
  * @file MatchFinder.cpp
  * @author Tran Chi Thien
  * @brief 
- * @version 2.0.4
+ * @version 2.0.5
  * @date 2023-04-17
  * 
  * @copyright Copyright (c) 2023

diff --git a/src/python/futag-package/README.md b/src/python/futag-package/README.md
@@ -20,7 +20,7 @@ This python package is for building library, generating and compiling fuzz-drive
 ## 1. Install
 
 ```bash 
-pip install dist/futag-2.0.4.tar.gz
+pip install dist/futag-2.0.5.tar.gz
 ```
 
 ## 2. Preprocessor

diff --git a/src/python/futag-package/dist/futag-2.0.4-py3-none-any.whl b/src/python/futag-package/dist/futag-2.0.4-py3-none-any.whl
diff --git a/src/python/futag-package/dist/futag-2.0.4.tar.gz b/src/python/futag-package/dist/futag-2.0.4.tar.gz
diff --git a/src/python/futag-package/dist/futag-2.0.5-py3-none-any.whl b/src/python/futag-package/dist/futag-2.0.5-py3-none-any.whl
diff --git a/src/python/futag-package/dist/futag-2.0.5.tar.gz b/src/python/futag-package/dist/futag-2.0.5.tar.gz
diff --git a/src/python/futag-package/setup.cfg b/src/python/futag-package/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = futag
-version = 2.0.4
+version = 2.0.5
 author = Futag-team of ISP RAS
 author_email = thientcgithub@gmail.com
 description = Python package of Futag

diff --git a/src/python/futag-package/setup.py b/src/python/futag-package/setup.py
@@ -2,7 +2,7 @@
 
 setup(
    name='futag',
-   version='2.0.4',
+   version='2.0.5',
    author='Futag-team of ISP RAS',
    author_email='thientcgithub@gmail.com',
    packages=['futag'],

diff --git a/src/python/futag-package/src/futag.egg-info/PKG-INFO b/src/python/futag-package/src/futag.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: futag
-Version: 2.0.4
+Version: 2.0.5
 Summary: Futag tools for creating fuzz targets of software library
 Home-page: https://github.com/ispras/Futag/tree/main/src/python/futag-package
 Author: Futag-team of ISP RAS
@@ -36,7 +36,7 @@ This python package is for building library, generating and compiling fuzz-drive
 ## 1. Install
 
 ```bash 
-pip install dist/futag-2.0.4.tar.gz
+pip install dist/futag-2.0.5.tar.gz
 ```
 
 ## 2. Preprocessor