Merge branch 'main' into ci-test

Author: StanFromIreland

README.md

@@ -25,6 +25,8 @@ Components that are hosted in this repository:
   the fuzzer can use when mutating input sequences.
 * Coverage header file (`python_coverage.h`): This file is compiled with CPython
   so that line coverage is tracked over time as the fuzzer executes.
+* Fuzz test list (`fuzz_targets.txt`): This file lists all fuzz targets and is
+  read by the OSS-Fuzz build script.
 
 Components that are hosted elsewhere:
 
@@ -34,8 +36,8 @@ Components that are hosted elsewhere:
   `Dockerfile` and `build.sh` describe how the fuzzer
   image is built and what fuzz targets are executed by OSS-Fuzz.
 
-When you create a new fuzz target **don't forget to add the target to the fuzzer image**
-so that the fuzz target is executed by OSS-Fuzz.
+When you create a new fuzz target, add the target to `fuzz_targets.txt` so that it
+is executed by OSS-Fuzz.
 
 ## Adding fuzzing to CPython CI
 

fuzz_targets.txt

@@ -0,0 +1,18 @@
+ast ast.py
+configparser configparser.py
+csv csv.py
+decode decode.py
+difflib difflib.py
+email email.py
+html html.py
+httpclient httpclient.py
+json json.py
+plistlib plist.py
+re re.py
+tarfile tarfile.py
+tarfile-hypothesis tarfile_hypothesis.py
+tomllib tomllib.py
+xml xml.py
+zipfile zipfile.py
+zipfile-hypothesis zipfile_hypothesis.py
+zoneinfo zoneinfo.py

fuzzer.cpp

@@ -65,14 +65,6 @@ extern "C" int LLVMFuzzerInitialize(int* argc, char*** argv) {
 
     std::string code = std::string(program.data(), program.data() + program.size());
 
-#if 0
-    {
-        wchar_t *program = Py_DecodeLocale(argv0.c_str(), nullptr);
-        Py_SetProgramName(program);
-        PyMem_RawFree(program);
-    }
-#endif
-
     Py_Initialize();
 
     {