Renamed _fuzz to _xxtestfuzz and cleanup.

Testing it resulted in a few cleanups such as PY_SSIZE_T_CLEAN being required to avoid from crashing in an opt build.
gpshead · Sep 6, 2017 · Jul 21, 2017 · Jul 25, 2017 · Jul 25, 2017 · Jul 25, 2017
commit 6da8e979475e5e1c9dc2ca58263338d0b33f1854
diff --git a/Lib/test/test_fuzz.py b/Lib/test/test_fuzz.py
diff --git a/Lib/test/test_xxtestfuzz.py b/Lib/test/test_xxtestfuzz.py
@@ -0,0 +1,23 @@
+import faulthandler
+import test.support
+import unittest
+
+_xxtestfuzz = test.support.import_module('_xxtestfuzz')
+
+
+class TestFuzzer(unittest.TestCase):
+    """To keep our https://github.com/google/oss-fuzz API working."""
+
+    def test_sample_input_smoke_test(self):
+        """This is only a regression test: Check that it doesn't crash."""
+        _xxtestfuzz.run(b"")
+        _xxtestfuzz.run(b"\0")
+        _xxtestfuzz.run(b"{")
+        _xxtestfuzz.run(b" ")
+        _xxtestfuzz.run(b"x")
+        _xxtestfuzz.run(b"1")
+
+
+if __name__ == "__main__":
+    faulthandler.enable()
+    unittest.main()
diff --git a/Modules/_fuzz/README.rst → Modules/_xxtestfuzz/README.rst b/Modules/_fuzz/README.rst → Modules/_xxtestfuzz/README.rst
diff --git a/Modules/_fuzz/_fuzzmodule.c → Modules/_xxtestfuzz/_xxtestfuzz.c b/Modules/_fuzz/_fuzzmodule.c → Modules/_xxtestfuzz/_xxtestfuzz.c
@@ -1,3 +1,4 @@
+#define PY_SSIZE_T_CLEAN
 #include <Python.h>
 #include <stdlib.h>
 #include <inttypes.h>
@@ -6,7 +7,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size);
 
 static PyObject* _fuzz_run(PyObject* self, PyObject* args) {
     const char* buf;
-    size_t size;
+    Py_ssize_t size;
     if (!PyArg_ParseTuple(args, "s#", &buf, &size)) {
         return NULL;
     }
@@ -41,7 +42,7 @@ static struct PyModuleDef _fuzzmodule = {
 };
 
 PyMODINIT_FUNC
-PyInit__fuzz(void)
+PyInit__xxtestfuzz(void)
 {
     PyObject *m = NULL;
 

diff --git a/Modules/_fuzz/fuzz_tests.txt → Modules/_xxtestfuzz/fuzz_tests.txt b/Modules/_fuzz/fuzz_tests.txt → Modules/_xxtestfuzz/fuzz_tests.txt
diff --git a/Modules/_fuzz/fuzzer.c → Modules/_xxtestfuzz/fuzzer.c b/Modules/_fuzz/fuzzer.c → Modules/_xxtestfuzz/fuzzer.c
diff --git a/setup.py b/setup.py
@@ -717,8 +717,8 @@ def detect_modules(self):
 
         # Fuzz tests.
         exts.append( Extension(
-            '_fuzz',
-            ['_fuzz/_fuzzmodule.c', '_fuzz/fuzzer.c'])
+            '_xxtestfuzz',
+            ['_xxtestfuzz/_xxtestfuzz.c', '_xxtestfuzz/fuzzer.c'])
         )
 
         #