From bf1d4762508c76f90682cbadae161bbb83fb189e Mon Sep 17 00:00:00 2001 From: DavidKorczynski Date: Tue, 17 Mar 2026 17:57:58 +0000 Subject: [PATCH] Fix broken OSS-Fuzz build.sh (#530) Adds `--collect-submodules=bitstring` when packaging the harnesses. Fixes: https://oss-fuzz-build-logs.storage.googleapis.com/log-850dd25a-c58a-4c37-abd4-c5a703638319.txt ``` ... Step #4 - "build-check-libfuzzer-address-x86_64": INFO: Instrumenting pyvex.data_ref Step #4 - "build-check-libfuzzer-address-x86_64": INFO: Instrumenting pyvex.lifting Step #4 - "build-check-libfuzzer-address-x86_64": INFO: Instrumenting pyvex.lifting.gym Step #4 - "build-check-libfuzzer-address-x86_64": INFO: Instrumenting pyvex.lifting.gym.aarch64_spotter Step #4 - "build-check-libfuzzer-address-x86_64": INFO: Instrumenting pyvex.lifting.util Step #4 - "build-check-libfuzzer-address-x86_64": INFO: Instrumenting pyvex.lifting.util.instr_helper Step #4 - "build-check-libfuzzer-address-x86_64": Traceback (most recent call last): Step #4 - "build-check-libfuzzer-address-x86_64": File "irsb_fuzzer.py", line 26, in Step #4 - "build-check-libfuzzer-address-x86_64": File "PyInstaller/loader/pyimod02_importers.py", line 378, in exec_module Step #4 - "build-check-libfuzzer-address-x86_64": File "pyvex/__init__.py", line 41, in Step #4 - "build-check-libfuzzer-address-x86_64": File "PyInstaller/loader/pyimod02_importers.py", line 378, in exec_module Step #4 - "build-check-libfuzzer-address-x86_64": File "pyvex/lifting/__init__.py", line 1, in Step #4 - "build-check-libfuzzer-address-x86_64": File "PyInstaller/loader/pyimod02_importers.py", line 378, in exec_module Step #4 - "build-check-libfuzzer-address-x86_64": File "pyvex/lifting/gym/__init__.py", line 1, in Step #4 - "build-check-libfuzzer-address-x86_64": File "PyInstaller/loader/pyimod02_importers.py", line 378, in exec_module Step #4 - "build-check-libfuzzer-address-x86_64": File "pyvex/lifting/gym/aarch64_spotter.py", line 3, in Step #4 - "build-check-libfuzzer-address-x86_64": File "PyInstaller/loader/pyimod02_importers.py", line 378, in exec_module Step #4 - "build-check-libfuzzer-address-x86_64": File "pyvex/lifting/util/__init__.py", line 1, in Step #4 - "build-check-libfuzzer-address-x86_64": File "PyInstaller/loader/pyimod02_importers.py", line 378, in exec_module Step #4 - "build-check-libfuzzer-address-x86_64": File "pyvex/lifting/util/instr_helper.py", line 4, in Step #4 - "build-check-libfuzzer-address-x86_64": File "PyInstaller/loader/pyimod02_importers.py", line 378, in exec_module Step #4 - "build-check-libfuzzer-address-x86_64": File "bitstring/__init__.py", line 75, in Step #4 - "build-check-libfuzzer-address-x86_64": File "importlib/__init__.py", line 126, in import_module Step #4 - "build-check-libfuzzer-address-x86_64": ModuleNotFoundError: No module named 'bitstring.bitstore_bitarray' Step #4 - "build-check-libfuzzer-address-x86_64": [PYI-106:ERROR] Failed to execute script 'irsb_fuzzer' due to unhandled exception! Step #4 - "build-check-libfuzzer-address-x86_64": Step #4 - "build-check-libfuzzer-address-x86_64": ERROR: 100.0% of fuzz targets seem to be broken. See the list above for a detailed information. ``` --- fuzzing/build.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fuzzing/build.sh b/fuzzing/build.sh index 1d46da0..d764f53 100755 --- a/fuzzing/build.sh +++ b/fuzzing/build.sh @@ -28,6 +28,9 @@ clang -Os -s /tmp/corpus.s -nostdlib -nostartfiles -m32 -o corpus zip -r "$OUT"/irsb_fuzzer_seed_corpus.zip corpus # Build fuzzers in $OUT +# --collect-submodules=bitstring ensures all bitstring submodules are bundled by PyInstaller for fuzzer in $(find $SRC -name '*_fuzzer.py'); do - compile_python_fuzzer "$fuzzer" --add-binary="pyvex/lib/libpyvex.so:pyvex/lib" + compile_python_fuzzer "$fuzzer" \ + --add-binary="pyvex/lib/libpyvex.so:pyvex/lib" \ + --collect-submodules=bitstring done