fixes

Author: abenso

fuzzing/Makefile

@@ -10,6 +10,7 @@ FUZZ_DIR = fuzz_local
 # === PYTHON FORMATTING CONFIGURATION ===
 BLACK_LINE_LENGTH := 120
 FUZZING_DIR := .
+PYTHON ?= python3
 
 # Default target
 .PHONY: help
@@ -69,7 +70,7 @@ fuzz: build_fuzz
 	@echo "🚀 Starting fuzzing session..."
 	@echo "   Duration: $(FUZZ_TIME) seconds"
 	@echo "   Jobs: $(FUZZ_JOBS)"
-	@python3 $(FUZZ_DIR)/run_local_fuzz.py \
+	@$(PYTHON) $(FUZZ_DIR)/run_local_fuzz.py \
 		--max-seconds $(FUZZ_TIME) \
 		--jobs $(FUZZ_JOBS)
 	@echo "🏁 Fuzzing session completed"
@@ -78,7 +79,7 @@ fuzz: build_fuzz
 .PHONY: fuzz_crash
 fuzz_crash: build_fuzz
 	@echo "🔍 Analyzing fuzzing crashes..."
-	@python3 $(FUZZ_DIR)/analyze_local_crashes.py
+	@$(PYTHON) $(FUZZ_DIR)/analyze_local_crashes.py
 
 # Clean fuzzing artifacts
 .PHONY: fuzz_clean

fuzzing/fuzz_local/analyze_local_crashes.py

@@ -17,18 +17,27 @@ def main():
     # Change to fuzz directory for execution
     os.chdir(script_dir)
 
+    analyzer_script = os.path.join(fuzzing_dir, "analyze_crashes.py")
+    if not os.path.exists(analyzer_script):
+        print(f"Error: Analyzer script not found at {analyzer_script}")
+        return 1
+
     # Run the common crash analyzer
     cmd = [
         sys.executable,
-        os.path.join(fuzzing_dir, "analyze_crashes.py"),
+        analyzer_script,
         "--fuzz-dir",
         script_dir,
     ]
 
-    print(f"🔍 Analyzing ledger-zxlib crashes...")
+    print("🔍 Analyzing ledger-zxlib crashes...")
     print(f"Working directory: {script_dir}")
 
-    return subprocess.call(cmd)
+    try:
+        return subprocess.call(cmd)
+    except (OSError, subprocess.SubprocessError) as e:
+        print(f"Error executing analyzer: {e}")
+        return 1
 
 
 if __name__ == "__main__":

fuzzing/fuzz_local/base58_fuzzer.cpp

@@ -18,15 +18,13 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
     size_t decode_outlen = sizeof(decode_output);
 
     // Create null-terminated string for decode test
-    char *decode_input = new char[size + 1];
-    memcpy(decode_input, data, size);
+    std::vector<char> decode_input(size + 1);
+    memcpy(decode_input.data(), data, size);
     decode_input[size] = '\0';
 
-    const int decode_result = decode_base58(decode_input, size, decode_output, &decode_outlen);
+    const int decode_result = decode_base58(decode_input.data(), size, decode_output, &decode_outlen);
     (void)decode_result;
 
-    delete[] decode_input;
-
     // Test encode_base58
     unsigned char encode_output[512];
     size_t encode_outlen = sizeof(encode_output);

fuzzing/fuzz_local/bech32_fuzzer.cpp

@@ -35,7 +35,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
     char hrp[17] = {0};
     for (int i = 0; i < hrp_len && i < 16; i++) {
         // Use printable ASCII characters for HRP (a-z)
-        hrp[i] = static_cast<char>('a' + (data[0] + i) % 26);
+        hrp[i] = static_cast<char>('a' + (data[1] + i) % 26);
     }
     hrp[hrp_len] = '\0';
 

fuzzing/fuzz_local/fuzz_config.py

@@ -7,12 +7,11 @@
 FUZZER_JOBS = 4
 
 
-class FuzzConfig:
-    """Configuration for a single fuzzer target"""
-
-    def __init__(self, name: str, max_len: int = 17000):
-        self.name = name
-        self.max_len = max_len
+import sys
+import os
+# Add parent directory to path to import FuzzConfig
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+from run_fuzzers import FuzzConfig
 
 
 def get_fuzzer_configs():

fuzzing/fuzz_local/run_local_fuzz.py

@@ -39,7 +39,7 @@ def main():
         str(args.jobs),
     ]
 
-    print(f"🚀 Starting ledger-zxlib fuzzing...")
+    print("🚀 Starting ledger-zxlib fuzzing...")
     print(f"Working directory: {script_dir}")
     print(f"Duration: {args.max_seconds}s, Jobs: {args.jobs}")
 

fuzzing/fuzz_local/segwit_addr_fuzzer.cpp

@@ -2,8 +2,6 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <iostream>
-
 extern "C" {
 #include "segwit_addr.h"
 }