fix #67, fix #64, fix #62, fix #63

CHANGELOG.md

@@ -68,4 +68,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Add Fuzzer extra params support
 
 ## 20230320
-- Support for context generation
+- Support for context generation
+
+## 20230305
+- Fix error python in Builder
+- Fix error python in Generator for wchar_t string

README.en.md

@@ -30,7 +30,7 @@ Additionally, Futag provides the ability to test compiled targets.
 You can try to build Futag with pre-built [Docker files](https://github.com/ispras/Futag/tree/main/product-tests/build-test) for Ubuntu OS.
 
 ### 2.2. Using a prepackaged package
-Download the latest [futag-llvm.2.0.0.tar.xz](https://github.com/ispras/Futag/releases/tag/2.0.0) and unzip
+Download the latest [futag-llvm.2.0.1.tar.xz](https://github.com/ispras/Futag/releases/tag/2.0.0) and unzip
 
 ### 2.3. Building and installing from source
 

README.md

@@ -33,7 +33,7 @@ FUTAG  использует, в  качестве внешнего интерф
 Вы можете попробовать собрать Futag с готовыми [Докер-файлами](https://github.com/ispras/Futag/tree/main/product-tests/build-test) для ОС Ubuntu.
 
 ## 2.2. Использование предварительно упакованного пакета
-- Загрузите последнюю версию [futag-llvm.2.0.0.tar.xz](https://github.com/ispras/Futag/releases/tag/2.0.0) и разархивируйте.
+- Загрузите последнюю версию [futag-llvm.2.0.1.tar.xz](https://github.com/ispras/Futag/releases/tag/2.0.0) и разархивируйте.
 
 ## 2.3. Сборка и установка из исходного кода
 
@@ -82,8 +82,9 @@ FUTAG  использует, в  качестве внешнего интерф
 - Предварительно должен быть установлен пакет futag-<версия>.tar.gz по пути futag-llvm/python-package/:
 ```bash
   ~$ pip install -r futag-llvm/python-package/requirements.txt
-  ~$ pip install futag-llvm/python-package/futag-2.0.0.tar.gz
+  ~$ pip install futag-llvm/python-package/futag-2.0.1.tar.gz
 ```
+- Для того, чтобы Futag генерировал фаззинг-обертки в формате AFLplusplus необходимо запустить скрипт futag-llvm/export.sh
 
 ### 3.1. Автоматическая генерация фаззинг-оберток в условии отсутствия контекстов использования
 - Запуск сборки, проверки и анализа в условии отсутствия контекстов использования
@@ -184,6 +185,7 @@ context_generator.compile_targets( #компиляция сгенерирова
 ## 5. Статьи и материалы
 
 - C. T. Tran and S. Kurmangaleev, ["Futag: Automated fuzz target generator for testing software libraries"](https://ieeexplore.ieee.org/document/9693749) 2021 Ivannikov Memorial Workshop (IVMEM), 2021, pp. 80-85, doi: 10.1109/IVMEM53963.2021.00021.
+- C. T. Tran, D. Ponomarev and A. Kuznhesov, ["Research on automatic generation of fuzz-target for software library functions"](https://ieeexplore.ieee.org/document/10076871), 2022 Ivannikov Ispras Open Conference (ISPRAS), Moscow, Russian Federation, 2022, pp. 95-99, doi: 10.1109/ISPRAS57371.2022.10076871.
 
 - Исследования по автоматической генерации фаззинг-оберток для функций  библиотек, Открытая конференция ИСП РАН им. В.П. Иванникова 2022
 

custom-llvm/build.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-#===-- build.bash -------*- bash script -*-===//
+#===-- build.sh -------*- bash script -*-===//
 #
 # This file is distributed under the GPL v3 license (https://www.gnu.org/licenses/gpl-3.0.en.html).
 #

custom-llvm/buildwAFLplusplus.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-#===-- build.bash -------*- bash script -*-===//
+#===-- build.sh -------*- bash script -*-===//
 #
 # This file is distributed under the GPL v3 license (https://www.gnu.org/licenses/gpl-3.0.en.html).
 #
@@ -55,11 +55,11 @@ cp $futag_src/Checkers/lib/*.cpp $custom_llvm/clang/lib/StaticAnalyzer/Checkers/
 cp -r $futag_src/Checkers/lib/$CheckerCMakeLists $custom_llvm/clang/lib/StaticAnalyzer/Checkers/CMakeLists.txt
 
 if [ $llvmVersion == "LLVM=14.0.6" ]; then
-    cmake  -G "Unix Makefiles"  -DLLVM_BUILD_TESTS=OFF  -DLLVM_ENABLE_ZLIB=OFF  -DCMAKE_BUILD_TYPE=Release  -DLLVM_BINUTILS_INCDIR=/usr/include/  -DCMAKE_INSTALL_PREFIX=$futag_install_folder  -DCMAKE_EXPORT_COMPILE_COMMANDS=1  -DCLANG_INCLUDE_DOCS="OFF"  -DLLVM_BUILD_LLVM_DYLIB="ON"  -DLLVM_ENABLE_BINDINGS="OFF"  -DLLVM_ENABLE_PROJECTS='clang;'  -DLLVM_ENABLE_WARNINGS="OFF"  -DLLVM_INCLUDE_BENCHMARKS="OFF"  -DLLVM_INCLUDE_DOCS="OFF"  -DLLVM_INCLUDE_EXAMPLES="OFF"  -DLLVM_INCLUDE_TESTS="OFF"  -DLLVM_LINK_LLVM_DYLIB="ON"  -DLLVM_TARGETS_TO_BUILD="host" -DLLVM_ENABLE_RUNTIMES="compiler-rt;"  $custom_llvm/llvm
+    cmake  -G "Unix Makefiles"  -DLLVM_BUILD_TESTS=OFF  -DLLVM_ENABLE_ZLIB=ON  -DCMAKE_BUILD_TYPE=Release  -DLLVM_BINUTILS_INCDIR=/usr/include/  -DCMAKE_INSTALL_PREFIX=$futag_install_folder  -DCMAKE_EXPORT_COMPILE_COMMANDS=1  -DCLANG_INCLUDE_DOCS="OFF"  -DLLVM_BUILD_LLVM_DYLIB="ON"  -DLLVM_ENABLE_BINDINGS="OFF"  -DLLVM_ENABLE_PROJECTS='clang;'  -DLLVM_ENABLE_WARNINGS="OFF"  -DLLVM_INCLUDE_BENCHMARKS="OFF"  -DLLVM_INCLUDE_DOCS="OFF"  -DLLVM_INCLUDE_EXAMPLES="OFF"  -DLLVM_INCLUDE_TESTS="OFF"  -DLLVM_LINK_LLVM_DYLIB="ON"  -DLLVM_TARGETS_TO_BUILD="host" -DLLVM_ENABLE_RUNTIMES="compiler-rt;"  $custom_llvm/llvm
 
 fi
 if [ $llvmVersion == "LLVM=13.0.1" ]; then
-    cmake  -G "Unix Makefiles"  -DLLVM_BUILD_TESTS=OFF  -DLLVM_ENABLE_ZLIB=OFF  -DCMAKE_BUILD_TYPE=Release  -DLLVM_BINUTILS_INCDIR=/usr/include/  -DCMAKE_INSTALL_PREFIX=$futag_install_folder  -DCMAKE_EXPORT_COMPILE_COMMANDS=1  -DCLANG_INCLUDE_DOCS="OFF"  -DLLVM_BUILD_LLVM_DYLIB="ON"  -DLLVM_ENABLE_BINDINGS="OFF"  -DLLVM_ENABLE_PROJECTS='clang;compiler-rt;'  -DLLVM_ENABLE_WARNINGS="OFF"  -DLLVM_INCLUDE_BENCHMARKS="OFF"  -DLLVM_INCLUDE_DOCS="OFF"  -DLLVM_INCLUDE_EXAMPLES="OFF"  -DLLVM_INCLUDE_TESTS="OFF"  -DLLVM_LINK_LLVM_DYLIB="ON"  -DLLVM_TARGETS_TO_BUILD="host"  $custom_llvm/llvm
+    cmake  -G "Unix Makefiles"  -DLLVM_BUILD_TESTS=OFF  -DLLVM_ENABLE_ZLIB=ON  -DCMAKE_BUILD_TYPE=Release  -DLLVM_BINUTILS_INCDIR=/usr/include/  -DCMAKE_INSTALL_PREFIX=$futag_install_folder  -DCMAKE_EXPORT_COMPILE_COMMANDS=1  -DCLANG_INCLUDE_DOCS="OFF"  -DLLVM_BUILD_LLVM_DYLIB="ON"  -DLLVM_ENABLE_BINDINGS="OFF"  -DLLVM_ENABLE_PROJECTS='clang;compiler-rt;'  -DLLVM_ENABLE_WARNINGS="OFF"  -DLLVM_INCLUDE_BENCHMARKS="OFF"  -DLLVM_INCLUDE_DOCS="OFF"  -DLLVM_INCLUDE_EXAMPLES="OFF"  -DLLVM_INCLUDE_TESTS="OFF"  -DLLVM_LINK_LLVM_DYLIB="ON"  -DLLVM_TARGETS_TO_BUILD="host"  $custom_llvm/llvm
 
 fi
 make -j$(($(nproc)/2)) && make -j$(($(nproc)/2)) install
@@ -86,6 +86,7 @@ cp -r $futag_src/svres-tmpl $futag_install_folder/
 cp -r ../*.md $futag_install_folder/
 cp -r ../LICENSE $futag_install_folder/
 cp $custom_prepare/INFO $futag_install_folder/
+cp $custom_prepare/export.sh $futag_install_folder/
 git rev-parse HEAD >> $futag_install_folder/INFO
 
 cd ../product-tests

custom-llvm/export.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+#===-- export.sh -------*- bash script -*-===//
+#
+# This file is distributed under the GPL v3 license (https://www.gnu.org/licenses/gpl-3.0.en.html).
+#
+# This script helps to build  llvm with clang and compiler-rt
+
+echo "************************************************"
+echo "*      ______  __  __  ______  ___     ______  *"
+echo "*     / ____/ / / / / /_  __/ /   |   / ____/  *"
+echo "*    / /_    / / / /   / /   / /| |  / / __    *"
+echo "*   / __/   / /_/ /   / /   / ___ | / /_/ /    *"
+echo "*  /_/      \____/   /_/   /_/  |_| \____/     *"
+echo "*                                              *"
+echo "*     Fuzzing target Automated Generator       *"
+echo "*             a tool of ISP RAS                *"
+echo "************************************************"
+echo ""
+
+SCRIPTPATH="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
+echo "Exporting Futag path for AFLplusplus: "$SCRIPTPATH
+echo ""
+set -x
+export PATH="$SCRIPTPATH/bin:$PATH"
+export LLVM_CONFIG="$SCRIPTPATH/bin/llvm-config"
+export LD_LIBRARY_PATH="$(llvm-config --libdir)${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"

product-tests/build-test/ubuntu20/Docker-test-build.Dockerfile

@@ -24,7 +24,7 @@ RUN ./build.sh
 
 USER root
 WORKDIR /home/futag/Futag/
-RUN pip install futag-llvm/python-package/futag-2.0.0.tar.gz
+RUN pip install futag-llvm/python-package/futag-2.0.1.tar.gz
 RUN pip install -r futag-llvm/python-package/requirements.txt
 
 USER futag 

product-tests/build-test/ubuntu22/Docker-test-build.Dockerfile

@@ -20,7 +20,7 @@ RUN ./build.sh
 
 USER root
 WORKDIR /home/futag/Futag/
-RUN pip install futag-llvm/python-package/futag-2.0.0.tar.gz
+RUN pip install futag-llvm/python-package/futag-2.0.1.tar.gz
 
 USER futag 
 WORKDIR /home/futag/Futag/

product-tests/libraries-test/ubuntu20/Docker-test-libs.Dockerfile

@@ -22,7 +22,7 @@ WORKDIR /home/futag/Futag-tests
 RUN ./get-Futag.sh
 
 USER root
-RUN pip install futag-llvm/python-package/futag-2.0.0.tar.gz
+RUN pip install futag-llvm/python-package/futag-2.0.1.tar.gz
 RUN pip install -r futag-llvm/python-package/requirements.txt
 
 USER futag 

product-tests/libraries-test/ubuntu22/Docker-test-libs.Dockerfile

@@ -19,7 +19,7 @@ RUN ./get-Futag.sh
 
 USER root
 WORKDIR /home/futag/Futag/
-RUN pip install futag-llvm/python-package/futag-2.0.0.tar.gz
+RUN pip install futag-llvm/python-package/futag-2.0.1.tar.gz
 RUN pip install -r futag-llvm/python-package/requirements.txt
 
 USER futag 

product-tests/package-test/ubuntu20/Docker-test-package.Dockerfile

@@ -20,7 +20,7 @@ ADD futag-llvm.latest.tar.xz /home/futag/Futag/
 
 USER root
 WORKDIR /home/futag/Futag/
-RUN pip install futag-llvm/python-package/futag-2.0.0.tar.gz
+RUN pip install futag-llvm/python-package/futag-2.0.1.tar.gz
 RUN pip install -r futag-llvm/python-package/requirements.txt
 
 USER futag 

product-tests/package-test/ubuntu22/Docker-test-package.Dockerfile

@@ -17,7 +17,7 @@ ADD futag-llvm.latest.tar.xz /home/futag/Futag
 
 USER root
 WORKDIR /home/futag/Futag/
-RUN pip install futag-llvm/python-package/futag-2.0.0.tar.gz
+RUN pip install futag-llvm/python-package/futag-2.0.1.tar.gz
 RUN pip install -r futag-llvm/python-package/requirements.txt
 
 USER futag 

src/clang/include/Futag/Basic.h

@@ -126,22 +126,23 @@ typedef enum {
 typedef enum {
   F_BUILTIN,        // 0: All basic types: int, float, double,...
   F_CSTRING,        // 1: char *, const char *
-  F_CXXSTRING,      // 2: char *, const char *
-  F_ENUM,           // 3
-  F_ARRAY,          // 4
-  F_VOIDP,          // 5
-  F_QUALIFIER,      // 6: const, volatile, and restrict qualifiers
-  F_POINTER,        // 7
-  F_STRUCT,         // 8
-  F_UNION,          // 9
-  F_CLASS,          // 10
-  F_INCOMPLETE,     // 11
-  F_FUNCTION,       // 12
-  F_INPUT_CXXFILE,  // 13
-  F_OUTPUT_CXXFILE, // 14
-  F_CXXFILE,        // 15
-  F_CFILE,          // 16
-  F_UNKNOWN,        // 17
+  F_WSTRING,        // 2: char *, const char *
+  F_CXXSTRING,      // 3: char *, const char *
+  F_ENUM,           // 4
+  F_ARRAY,          // 5
+  F_VOIDP,          // 6
+  F_QUALIFIER,      // 7: const, volatile, and restrict qualifiers
+  F_POINTER,        // 8
+  F_STRUCT,         // 9
+  F_UNION,          // 10
+  F_CLASS,          // 11
+  F_INCOMPLETE,     // 12
+  F_FUNCTION,       // 13
+  F_INPUT_CXXFILE,  // 14
+  F_OUTPUT_CXXFILE, // 15
+  F_CXXFILE,        // 16
+  F_CFILE,          // 17
+  F_UNKNOWN,        // 18
 } FutagGenType;
 
 typedef struct {

src/clang/lib/Futag/Basic.cpp

@@ -13,8 +13,8 @@
  *             a tool of ISP RAS                *
  ************************************************
  *
- * @version 1.3.1
- * @date 2023-01-29
+ * @version 2.0.1
+ * @date 2023-04-05
  *
  * @copyright This file is distributed under the GPL v3 license
  *
@@ -400,11 +400,13 @@ vector<GenTypeInfo> getGenType(QualType type) {
         if (std::find(str_types.begin(), str_types.end(),
                       type.getCanonicalType().getAsString()) !=
             str_types.end()) {
+            gen_list.gen_type = FutagGenType::F_CSTRING;
             gen_list.base_type_name = "char *";
             if (std::find(wchar_str_types.begin(), wchar_str_types.end(),
                           type.getCanonicalType().getAsString()) !=
                 wchar_str_types.end()) {
                 gen_list.base_type_name = "wchar_t *";
+                gen_list.gen_type = FutagGenType::F_WSTRING;
             }
             if (std::find(const_str_types.begin(), const_str_types.end(),
                           type.getCanonicalType().getAsString()) !=
@@ -416,9 +418,10 @@ vector<GenTypeInfo> getGenType(QualType type) {
                 if (canonical_type.getAsString() == "const wchar_t *" ||
                     canonical_type.getAsString() == "const wchar_t *const") {
                     gen_list.base_type_name = "wchar_t *";
+                    gen_list.gen_type = FutagGenType::F_WSTRING;
                 }
             }
-            gen_list.gen_type = FutagGenType::F_CSTRING;
+
             result.insert(result.begin(), gen_list);
             return result;
         }
@@ -584,6 +587,10 @@ std::string GetFutagGenTypeFromIdx(FutagGenType idx) {
         return "_CSTRING";
         break;
 
+    case FutagGenType::F_WSTRING:
+        return "_WSTRING";
+        break;
+
     case FutagGenType::F_CXXSTRING:
         return "_CXXSTRING";
         break;

src/clang/lib/Futag/ConsumerFinder.cpp

@@ -311,7 +311,9 @@ void SearchVarDeclInBlock(
     futag::FutagPath &curr_analyzed_path,          // for checking reverse match
     std::vector<FutagInitVarDeclCallExpr> &init_calls,
     const json &analysis_jdb) {
+
     MatchFinder Finder;
+
     const auto matched_binaryoperator =
         binaryOperator(
             isAssignmentOperator(),
@@ -321,6 +323,7 @@ void SearchVarDeclInBlock(
                 declRefExpr(to(functionDecl().bind("DefTargetFunctionCall")))
                     .bind("DefDeclRefExpr"))))
             .bind("DefFutagBinOpArg");
+
     const auto matched_vardecl =
         varDecl(hasName(iter_arg.value),
                 hasDescendant(declRefExpr(to(functionDecl().bind(

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-1.3.1.tar.gz
+pip install dist/futag-2.0.1.tar.gz
 ```
 
 ## 2. Preprocessor

src/python/futag-package/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = futag
-version = 2.0.0
+version = 2.0.1
 author = Futag-team of ISP RAS
 author_email = thientcgithub@gmail.com
 description = Python package of Futag

src/python/futag-package/setup.py

@@ -2,7 +2,7 @@
 
 setup(
    name='futag',
-   version='2.0.0',
+   version='2.0.1',
    author='Futag-team of ISP RAS',
    author_email='thientcgithub@gmail.com',
    packages=['futag'],

src/python/futag-package/src/futag.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: futag
-Version: 2.0.0
+Version: 2.0.1
 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-1.3.1.tar.gz
+pip install dist/futag-2.0.1.tar.gz
 ```
 
 ## 2. Preprocessor

src/python/futag-package/src/futag/fuzzer.py

@@ -582,10 +582,9 @@ def fuzz(self, extra_param: str = ""):
                 for x in [t for t in dir.glob("*.out") if t.is_file()]:
                     print("\n-- [Futag] FUZZING driver: " + x.stem + "... \n")
                     my_env = os.environ.copy()
-                    if self.leak:
-                        my_env["ASAN_OPTIONS"] = "allocator_may_return_null=1"
-                    else:
-                        my_env["ASAN_OPTIONS"] = "detect_leaks=0:allocator_may_return_null=1"
+                    if not self.leak:
+                        my_env["ASAN_OPTIONS"] = "detect_leaks=0"
+
                     my_env["ASAN_SYMBOLIZER_PATH"] = symbolizer.as_posix()
                     if self.coverage:
                         my_env["LLVM_PROFILE_FILE"] = x.as_posix() + ".profraw"