Restoring authorship annotation for <shadchin@yandex-team.ru>. Commit 2 of 2.

2 files changed, 383 insertions, 383 deletions

diff --git a/contrib/tools/python3/src/Modules/_xxtestfuzz/_xxtestfuzz.c b/contrib/tools/python3/src/Modules/_xxtestfuzz/_xxtestfuzz.c
index 79cd215d91..e0694de671 100644
--- a/contrib/tools/python3/src/Modules/_xxtestfuzz/_xxtestfuzz.c
+++ b/contrib/tools/python3/src/Modules/_xxtestfuzz/_xxtestfuzz.c
@@ -44,5 +44,5 @@ static struct PyModuleDef _fuzzmodule = {
 PyMODINIT_FUNC
 PyInit__xxtestfuzz(void)
 {
-    return PyModule_Create(&_fuzzmodule); 
+    return PyModule_Create(&_fuzzmodule);
 }
diff --git a/contrib/tools/python3/src/Modules/_xxtestfuzz/fuzzer.c b/contrib/tools/python3/src/Modules/_xxtestfuzz/fuzzer.c
index 4dd447fcaa..6bd2c3aedc 100644
--- a/contrib/tools/python3/src/Modules/_xxtestfuzz/fuzzer.c
+++ b/contrib/tools/python3/src/Modules/_xxtestfuzz/fuzzer.c
@@ -28,15 +28,15 @@ static int fuzz_builtin_float(const char* data, size_t size) {
     return 0;
 }
 
-#define MAX_INT_TEST_SIZE 0x10000 
- 
+#define MAX_INT_TEST_SIZE 0x10000
+
 /* Fuzz PyLong_FromUnicodeObject as a proxy for int(str). */
 static int fuzz_builtin_int(const char* data, size_t size) {
-    /* Ignore test cases with very long ints to avoid timeouts 
-       int("9" * 1000000) is not a very interesting test caase */ 
-    if (size > MAX_INT_TEST_SIZE) { 
-        return 0; 
-    } 
+    /* Ignore test cases with very long ints to avoid timeouts
+       int("9" * 1000000) is not a very interesting test caase */
+    if (size > MAX_INT_TEST_SIZE) {
+        return 0;
+    }
     /* Pick a random valid base. (When the fuzzed function takes extra
        parameters, it's somewhat normal to hash the input to generate those
        parameters. We want to exercise all code paths, so we do so here.) */
@@ -79,320 +79,320 @@ static int fuzz_builtin_unicode(const char* data, size_t size) {
     return 0;
 }
 
- 
-PyObject* struct_unpack_method = NULL; 
-PyObject* struct_error = NULL; 
-/* Called by LLVMFuzzerTestOneInput for initialization */ 
-static int init_struct_unpack() { 
-    /* Import struct.unpack */ 
-    PyObject* struct_module = PyImport_ImportModule("struct"); 
-    if (struct_module == NULL) { 
-        return 0; 
-    } 
-    struct_error = PyObject_GetAttrString(struct_module, "error"); 
-    if (struct_error == NULL) { 
-        return 0; 
-    } 
-    struct_unpack_method = PyObject_GetAttrString(struct_module, "unpack"); 
-    return struct_unpack_method != NULL; 
-} 
-/* Fuzz struct.unpack(x, y) */ 
-static int fuzz_struct_unpack(const char* data, size_t size) { 
-    /* Everything up to the first null byte is considered the 
-       format. Everything after is the buffer */ 
-    const char* first_null = memchr(data, '\0', size); 
-    if (first_null == NULL) { 
-        return 0; 
-    } 
- 
-    size_t format_length = first_null - data; 
-    size_t buffer_length = size - format_length - 1; 
- 
-    PyObject* pattern = PyBytes_FromStringAndSize(data, format_length); 
-    if (pattern == NULL) { 
-        return 0; 
-    } 
-    PyObject* buffer = PyBytes_FromStringAndSize(first_null + 1, buffer_length); 
-    if (buffer == NULL) { 
-        Py_DECREF(pattern); 
-        return 0; 
-    } 
- 
-    PyObject* unpacked = PyObject_CallFunctionObjArgs( 
-        struct_unpack_method, pattern, buffer, NULL); 
-    /* Ignore any overflow errors, these are easily triggered accidentally */ 
-    if (unpacked == NULL && PyErr_ExceptionMatches(PyExc_OverflowError)) { 
-        PyErr_Clear(); 
-    } 
-    /* The pascal format string will throw a negative size when passing 0 
-       like: struct.unpack('0p', b'') */ 
-    if (unpacked == NULL && PyErr_ExceptionMatches(PyExc_SystemError)) { 
-        PyErr_Clear(); 
-    } 
-    /* Ignore any struct.error exceptions, these can be caused by invalid 
-       formats or incomplete buffers both of which are common. */ 
-    if (unpacked == NULL && PyErr_ExceptionMatches(struct_error)) { 
-        PyErr_Clear(); 
-    } 
- 
-    Py_XDECREF(unpacked); 
-    Py_DECREF(pattern); 
-    Py_DECREF(buffer); 
-    return 0; 
-} 
- 
- 
-#define MAX_JSON_TEST_SIZE 0x10000 
- 
-PyObject* json_loads_method = NULL; 
-/* Called by LLVMFuzzerTestOneInput for initialization */ 
-static int init_json_loads() { 
-    /* Import json.loads */ 
-    PyObject* json_module = PyImport_ImportModule("json"); 
-    if (json_module == NULL) { 
-        return 0; 
-    } 
-    json_loads_method = PyObject_GetAttrString(json_module, "loads"); 
-    return json_loads_method != NULL; 
-} 
-/* Fuzz json.loads(x) */ 
-static int fuzz_json_loads(const char* data, size_t size) { 
-    /* Since python supports arbitrarily large ints in JSON, 
-       long inputs can lead to timeouts on boring inputs like 
-       `json.loads("9" * 100000)` */ 
-    if (size > MAX_JSON_TEST_SIZE) { 
-        return 0; 
-    } 
-    PyObject* input_bytes = PyBytes_FromStringAndSize(data, size); 
-    if (input_bytes == NULL) { 
-        return 0; 
-    } 
-    PyObject* parsed = PyObject_CallOneArg(json_loads_method, input_bytes); 
-    if (parsed == NULL) { 
-        /* Ignore ValueError as the fuzzer will more than likely 
-           generate some invalid json and values */ 
-        if (PyErr_ExceptionMatches(PyExc_ValueError) || 
-        /* Ignore RecursionError as the fuzzer generates long sequences of 
-           arrays such as `[[[...` */ 
-            PyErr_ExceptionMatches(PyExc_RecursionError) || 
-        /* Ignore unicode errors, invalid byte sequences are common */ 
-            PyErr_ExceptionMatches(PyExc_UnicodeDecodeError) 
-        ) { 
-            PyErr_Clear(); 
-        } 
-    } 
-    Py_DECREF(input_bytes); 
-    Py_XDECREF(parsed); 
-    return 0; 
-} 
- 
-#define MAX_RE_TEST_SIZE 0x10000 
- 
-PyObject* sre_compile_method = NULL; 
-PyObject* sre_error_exception = NULL; 
-int SRE_FLAG_DEBUG = 0; 
-/* Called by LLVMFuzzerTestOneInput for initialization */ 
-static int init_sre_compile() { 
-    /* Import sre_compile.compile and sre.error */ 
-    PyObject* sre_compile_module = PyImport_ImportModule("sre_compile"); 
-    if (sre_compile_module == NULL) { 
-        return 0; 
-    } 
-    sre_compile_method = PyObject_GetAttrString(sre_compile_module, "compile"); 
-    if (sre_compile_method == NULL) { 
-        return 0; 
-    } 
- 
-    PyObject* sre_constants = PyImport_ImportModule("sre_constants"); 
-    if (sre_constants == NULL) { 
-        return 0; 
-    } 
-    sre_error_exception = PyObject_GetAttrString(sre_constants, "error"); 
-    if (sre_error_exception == NULL) { 
-        return 0; 
-    } 
-    PyObject* debug_flag = PyObject_GetAttrString(sre_constants, "SRE_FLAG_DEBUG"); 
-    if (debug_flag == NULL) { 
-        return 0; 
-    } 
-    SRE_FLAG_DEBUG = PyLong_AsLong(debug_flag); 
-    return 1; 
-} 
-/* Fuzz _sre.compile(x) */ 
-static int fuzz_sre_compile(const char* data, size_t size) { 
-    /* Ignore really long regex patterns that will timeout the fuzzer */ 
-    if (size > MAX_RE_TEST_SIZE) { 
-        return 0; 
-    } 
-    /* We treat the first 2 bytes of the input as a number for the flags */ 
-    if (size < 2) { 
-        return 0; 
-    } 
-    uint16_t flags = ((uint16_t*) data)[0]; 
-    /* We remove the SRE_FLAG_DEBUG if present. This is because it 
-       prints to stdout which greatly decreases fuzzing speed */ 
-    flags &= ~SRE_FLAG_DEBUG; 
- 
-    /* Pull the pattern from the remaining bytes */ 
-    PyObject* pattern_bytes = PyBytes_FromStringAndSize(data + 2, size - 2); 
-    if (pattern_bytes == NULL) { 
-        return 0; 
-    } 
-    PyObject* flags_obj = PyLong_FromUnsignedLong(flags); 
-    if (flags_obj == NULL) { 
-        Py_DECREF(pattern_bytes); 
-        return 0; 
-    } 
- 
-    /* compiled = _sre.compile(data[2:], data[0:2] */ 
-    PyObject* compiled = PyObject_CallFunctionObjArgs( 
-        sre_compile_method, pattern_bytes, flags_obj, NULL); 
-    /* Ignore ValueError as the fuzzer will more than likely 
-       generate some invalid combination of flags */ 
-    if (compiled == NULL && PyErr_ExceptionMatches(PyExc_ValueError)) { 
-        PyErr_Clear(); 
-    } 
-    /* Ignore some common errors thrown by sre_parse: 
-       Overflow, Assertion, Recursion and Index */ 
-    if (compiled == NULL && (PyErr_ExceptionMatches(PyExc_OverflowError) || 
-                             PyErr_ExceptionMatches(PyExc_AssertionError) || 
-                             PyErr_ExceptionMatches(PyExc_RecursionError) || 
-                             PyErr_ExceptionMatches(PyExc_IndexError)) 
-    ) { 
-        PyErr_Clear(); 
-    } 
-    /* Ignore re.error */ 
-    if (compiled == NULL && PyErr_ExceptionMatches(sre_error_exception)) { 
-        PyErr_Clear(); 
-    } 
- 
-    Py_DECREF(pattern_bytes); 
-    Py_DECREF(flags_obj); 
-    Py_XDECREF(compiled); 
-    return 0; 
-} 
- 
-/* Some random patterns used to test re.match. 
-   Be careful not to add catostraphically slow regexes here, we want to 
-   exercise the matching code without causing timeouts.*/ 
-static const char* regex_patterns[] = { 
-    ".", "^", "abc", "abc|def", "^xxx$", "\\b", "()", "[a-zA-Z0-9]", 
-    "abc+", "[^A-Z]", "[x]", "(?=)", "a{z}", "a+b", "a*?", "a??", "a+?", 
-    "{}", "a{,}", "{", "}", "^\\(*\\d{3}\\)*( |-)*\\d{3}( |-)*\\d{4}$", 
-    "(?:a*)*", "a{1,2}?" 
-}; 
-const size_t NUM_PATTERNS = sizeof(regex_patterns) / sizeof(regex_patterns[0]); 
-PyObject** compiled_patterns = NULL; 
-/* Called by LLVMFuzzerTestOneInput for initialization */ 
-static int init_sre_match() { 
-    PyObject* re_module = PyImport_ImportModule("re"); 
-    if (re_module == NULL) { 
-        return 0; 
-    } 
-    compiled_patterns = (PyObject**) PyMem_RawMalloc( 
-        sizeof(PyObject*) * NUM_PATTERNS); 
-    if (compiled_patterns == NULL) { 
-        PyErr_NoMemory(); 
-        return 0; 
-    } 
- 
-    /* Precompile all the regex patterns on the first run for faster fuzzing */ 
-    for (size_t i = 0; i < NUM_PATTERNS; i++) { 
-        PyObject* compiled = PyObject_CallMethod( 
-            re_module, "compile", "y", regex_patterns[i]); 
-        /* Bail if any of the patterns fail to compile */ 
-        if (compiled == NULL) { 
-            return 0; 
-        } 
-        compiled_patterns[i] = compiled; 
-    } 
-    return 1; 
-} 
-/* Fuzz re.match(x) */ 
-static int fuzz_sre_match(const char* data, size_t size) { 
-    if (size < 1 || size > MAX_RE_TEST_SIZE) { 
-        return 0; 
-    } 
-    /* Use the first byte as a uint8_t specifying the index of the 
-       regex to use */ 
-    unsigned char idx = (unsigned char) data[0]; 
-    idx = idx % NUM_PATTERNS; 
- 
-    /* Pull the string to match from the remaining bytes */ 
-    PyObject* to_match = PyBytes_FromStringAndSize(data + 1, size - 1); 
-    if (to_match == NULL) { 
-        return 0; 
-    } 
- 
-    PyObject* pattern = compiled_patterns[idx]; 
-    PyObject* match_callable = PyObject_GetAttrString(pattern, "match"); 
- 
-    PyObject* matches = PyObject_CallOneArg(match_callable, to_match); 
- 
-    Py_XDECREF(matches); 
-    Py_DECREF(match_callable); 
-    Py_DECREF(to_match); 
-    return 0; 
-} 
- 
-#define MAX_CSV_TEST_SIZE 0x10000 
-PyObject* csv_module = NULL; 
-PyObject* csv_error = NULL; 
-/* Called by LLVMFuzzerTestOneInput for initialization */ 
-static int init_csv_reader() { 
-    /* Import csv and csv.Error */ 
-    csv_module = PyImport_ImportModule("csv"); 
-    if (csv_module == NULL) { 
-        return 0; 
-    } 
-    csv_error = PyObject_GetAttrString(csv_module, "Error"); 
-    return csv_error != NULL; 
-} 
-/* Fuzz csv.reader([x]) */ 
-static int fuzz_csv_reader(const char* data, size_t size) { 
-    if (size < 1 || size > MAX_CSV_TEST_SIZE) { 
-        return 0; 
-    } 
-    /* Ignore non null-terminated strings since _csv can't handle 
-       embeded nulls */ 
-    if (memchr(data, '\0', size) == NULL) { 
-        return 0; 
-    } 
- 
-    PyObject* s = PyUnicode_FromString(data); 
-    /* Ignore exceptions until we have a valid string */ 
-    if (s == NULL) { 
-        PyErr_Clear(); 
-        return 0; 
-    } 
- 
-    /* Split on \n so we can test multiple lines */ 
-    PyObject* lines = PyObject_CallMethod(s, "split", "s", "\n"); 
-    if (lines == NULL) { 
-        Py_DECREF(s); 
-        return 0; 
-    } 
- 
-    PyObject* reader = PyObject_CallMethod(csv_module, "reader", "N", lines); 
-    if (reader) { 
-        /* Consume all of the reader as an iterator */ 
-        PyObject* parsed_line; 
-        while ((parsed_line = PyIter_Next(reader))) { 
-            Py_DECREF(parsed_line); 
-        } 
-    } 
- 
-    /* Ignore csv.Error because we're probably going to generate 
-       some bad files (embeded new-lines, unterminated quotes etc) */ 
-    if (PyErr_ExceptionMatches(csv_error)) { 
-        PyErr_Clear(); 
-    } 
- 
-    Py_XDECREF(reader); 
-    Py_DECREF(s); 
-    return 0; 
-} 
- 
+
+PyObject* struct_unpack_method = NULL;
+PyObject* struct_error = NULL;
+/* Called by LLVMFuzzerTestOneInput for initialization */
+static int init_struct_unpack() {
+    /* Import struct.unpack */
+    PyObject* struct_module = PyImport_ImportModule("struct");
+    if (struct_module == NULL) {
+        return 0;
+    }
+    struct_error = PyObject_GetAttrString(struct_module, "error");
+    if (struct_error == NULL) {
+        return 0;
+    }
+    struct_unpack_method = PyObject_GetAttrString(struct_module, "unpack");
+    return struct_unpack_method != NULL;
+}
+/* Fuzz struct.unpack(x, y) */
+static int fuzz_struct_unpack(const char* data, size_t size) {
+    /* Everything up to the first null byte is considered the
+       format. Everything after is the buffer */
+    const char* first_null = memchr(data, '\0', size);
+    if (first_null == NULL) {
+        return 0;
+    }
+
+    size_t format_length = first_null - data;
+    size_t buffer_length = size - format_length - 1;
+
+    PyObject* pattern = PyBytes_FromStringAndSize(data, format_length);
+    if (pattern == NULL) {
+        return 0;
+    }
+    PyObject* buffer = PyBytes_FromStringAndSize(first_null + 1, buffer_length);
+    if (buffer == NULL) {
+        Py_DECREF(pattern);
+        return 0;
+    }
+
+    PyObject* unpacked = PyObject_CallFunctionObjArgs(
+        struct_unpack_method, pattern, buffer, NULL);
+    /* Ignore any overflow errors, these are easily triggered accidentally */
+    if (unpacked == NULL && PyErr_ExceptionMatches(PyExc_OverflowError)) {
+        PyErr_Clear();
+    }
+    /* The pascal format string will throw a negative size when passing 0
+       like: struct.unpack('0p', b'') */
+    if (unpacked == NULL && PyErr_ExceptionMatches(PyExc_SystemError)) {
+        PyErr_Clear();
+    }
+    /* Ignore any struct.error exceptions, these can be caused by invalid
+       formats or incomplete buffers both of which are common. */
+    if (unpacked == NULL && PyErr_ExceptionMatches(struct_error)) {
+        PyErr_Clear();
+    }
+
+    Py_XDECREF(unpacked);
+    Py_DECREF(pattern);
+    Py_DECREF(buffer);
+    return 0;
+}
+
+
+#define MAX_JSON_TEST_SIZE 0x10000
+
+PyObject* json_loads_method = NULL;
+/* Called by LLVMFuzzerTestOneInput for initialization */
+static int init_json_loads() {
+    /* Import json.loads */
+    PyObject* json_module = PyImport_ImportModule("json");
+    if (json_module == NULL) {
+        return 0;
+    }
+    json_loads_method = PyObject_GetAttrString(json_module, "loads");
+    return json_loads_method != NULL;
+}
+/* Fuzz json.loads(x) */
+static int fuzz_json_loads(const char* data, size_t size) {
+    /* Since python supports arbitrarily large ints in JSON,
+       long inputs can lead to timeouts on boring inputs like
+       `json.loads("9" * 100000)` */
+    if (size > MAX_JSON_TEST_SIZE) {
+        return 0;
+    }
+    PyObject* input_bytes = PyBytes_FromStringAndSize(data, size);
+    if (input_bytes == NULL) {
+        return 0;
+    }
+    PyObject* parsed = PyObject_CallOneArg(json_loads_method, input_bytes);
+    if (parsed == NULL) {
+        /* Ignore ValueError as the fuzzer will more than likely
+           generate some invalid json and values */
+        if (PyErr_ExceptionMatches(PyExc_ValueError) ||
+        /* Ignore RecursionError as the fuzzer generates long sequences of
+           arrays such as `[[[...` */
+            PyErr_ExceptionMatches(PyExc_RecursionError) ||
+        /* Ignore unicode errors, invalid byte sequences are common */
+            PyErr_ExceptionMatches(PyExc_UnicodeDecodeError)
+        ) {
+            PyErr_Clear();
+        }
+    }
+    Py_DECREF(input_bytes);
+    Py_XDECREF(parsed);
+    return 0;
+}
+
+#define MAX_RE_TEST_SIZE 0x10000
+
+PyObject* sre_compile_method = NULL;
+PyObject* sre_error_exception = NULL;
+int SRE_FLAG_DEBUG = 0;
+/* Called by LLVMFuzzerTestOneInput for initialization */
+static int init_sre_compile() {
+    /* Import sre_compile.compile and sre.error */
+    PyObject* sre_compile_module = PyImport_ImportModule("sre_compile");
+    if (sre_compile_module == NULL) {
+        return 0;
+    }
+    sre_compile_method = PyObject_GetAttrString(sre_compile_module, "compile");
+    if (sre_compile_method == NULL) {
+        return 0;
+    }
+
+    PyObject* sre_constants = PyImport_ImportModule("sre_constants");
+    if (sre_constants == NULL) {
+        return 0;
+    }
+    sre_error_exception = PyObject_GetAttrString(sre_constants, "error");
+    if (sre_error_exception == NULL) {
+        return 0;
+    }
+    PyObject* debug_flag = PyObject_GetAttrString(sre_constants, "SRE_FLAG_DEBUG");
+    if (debug_flag == NULL) {
+        return 0;
+    }
+    SRE_FLAG_DEBUG = PyLong_AsLong(debug_flag);
+    return 1;
+}
+/* Fuzz _sre.compile(x) */
+static int fuzz_sre_compile(const char* data, size_t size) {
+    /* Ignore really long regex patterns that will timeout the fuzzer */
+    if (size > MAX_RE_TEST_SIZE) {
+        return 0;
+    }
+    /* We treat the first 2 bytes of the input as a number for the flags */
+    if (size < 2) {
+        return 0;
+    }
+    uint16_t flags = ((uint16_t*) data)[0];
+    /* We remove the SRE_FLAG_DEBUG if present. This is because it
+       prints to stdout which greatly decreases fuzzing speed */
+    flags &= ~SRE_FLAG_DEBUG;
+
+    /* Pull the pattern from the remaining bytes */
+    PyObject* pattern_bytes = PyBytes_FromStringAndSize(data + 2, size - 2);
+    if (pattern_bytes == NULL) {
+        return 0;
+    }
+    PyObject* flags_obj = PyLong_FromUnsignedLong(flags);
+    if (flags_obj == NULL) {
+        Py_DECREF(pattern_bytes);
+        return 0;
+    }
+
+    /* compiled = _sre.compile(data[2:], data[0:2] */
+    PyObject* compiled = PyObject_CallFunctionObjArgs(
+        sre_compile_method, pattern_bytes, flags_obj, NULL);
+    /* Ignore ValueError as the fuzzer will more than likely
+       generate some invalid combination of flags */
+    if (compiled == NULL && PyErr_ExceptionMatches(PyExc_ValueError)) {
+        PyErr_Clear();
+    }
+    /* Ignore some common errors thrown by sre_parse:
+       Overflow, Assertion, Recursion and Index */
+    if (compiled == NULL && (PyErr_ExceptionMatches(PyExc_OverflowError) ||
+                             PyErr_ExceptionMatches(PyExc_AssertionError) ||
+                             PyErr_ExceptionMatches(PyExc_RecursionError) ||
+                             PyErr_ExceptionMatches(PyExc_IndexError))
+    ) {
+        PyErr_Clear();
+    }
+    /* Ignore re.error */
+    if (compiled == NULL && PyErr_ExceptionMatches(sre_error_exception)) {
+        PyErr_Clear();
+    }
+
+    Py_DECREF(pattern_bytes);
+    Py_DECREF(flags_obj);
+    Py_XDECREF(compiled);
+    return 0;
+}
+
+/* Some random patterns used to test re.match.
+   Be careful not to add catostraphically slow regexes here, we want to
+   exercise the matching code without causing timeouts.*/
+static const char* regex_patterns[] = {
+    ".", "^", "abc", "abc|def", "^xxx$", "\\b", "()", "[a-zA-Z0-9]",
+    "abc+", "[^A-Z]", "[x]", "(?=)", "a{z}", "a+b", "a*?", "a??", "a+?",
+    "{}", "a{,}", "{", "}", "^\\(*\\d{3}\\)*( |-)*\\d{3}( |-)*\\d{4}$",
+    "(?:a*)*", "a{1,2}?"
+};
+const size_t NUM_PATTERNS = sizeof(regex_patterns) / sizeof(regex_patterns[0]);
+PyObject** compiled_patterns = NULL;
+/* Called by LLVMFuzzerTestOneInput for initialization */
+static int init_sre_match() {
+    PyObject* re_module = PyImport_ImportModule("re");
+    if (re_module == NULL) {
+        return 0;
+    }
+    compiled_patterns = (PyObject**) PyMem_RawMalloc(
+        sizeof(PyObject*) * NUM_PATTERNS);
+    if (compiled_patterns == NULL) {
+        PyErr_NoMemory();
+        return 0;
+    }
+
+    /* Precompile all the regex patterns on the first run for faster fuzzing */
+    for (size_t i = 0; i < NUM_PATTERNS; i++) {
+        PyObject* compiled = PyObject_CallMethod(
+            re_module, "compile", "y", regex_patterns[i]);
+        /* Bail if any of the patterns fail to compile */
+        if (compiled == NULL) {
+            return 0;
+        }
+        compiled_patterns[i] = compiled;
+    }
+    return 1;
+}
+/* Fuzz re.match(x) */
+static int fuzz_sre_match(const char* data, size_t size) {
+    if (size < 1 || size > MAX_RE_TEST_SIZE) {
+        return 0;
+    }
+    /* Use the first byte as a uint8_t specifying the index of the
+       regex to use */
+    unsigned char idx = (unsigned char) data[0];
+    idx = idx % NUM_PATTERNS;
+
+    /* Pull the string to match from the remaining bytes */
+    PyObject* to_match = PyBytes_FromStringAndSize(data + 1, size - 1);
+    if (to_match == NULL) {
+        return 0;
+    }
+
+    PyObject* pattern = compiled_patterns[idx];
+    PyObject* match_callable = PyObject_GetAttrString(pattern, "match");
+
+    PyObject* matches = PyObject_CallOneArg(match_callable, to_match);
+
+    Py_XDECREF(matches);
+    Py_DECREF(match_callable);
+    Py_DECREF(to_match);
+    return 0;
+}
+
+#define MAX_CSV_TEST_SIZE 0x10000
+PyObject* csv_module = NULL;
+PyObject* csv_error = NULL;
+/* Called by LLVMFuzzerTestOneInput for initialization */
+static int init_csv_reader() {
+    /* Import csv and csv.Error */
+    csv_module = PyImport_ImportModule("csv");
+    if (csv_module == NULL) {
+        return 0;
+    }
+    csv_error = PyObject_GetAttrString(csv_module, "Error");
+    return csv_error != NULL;
+}
+/* Fuzz csv.reader([x]) */
+static int fuzz_csv_reader(const char* data, size_t size) {
+    if (size < 1 || size > MAX_CSV_TEST_SIZE) {
+        return 0;
+    }
+    /* Ignore non null-terminated strings since _csv can't handle
+       embeded nulls */
+    if (memchr(data, '\0', size) == NULL) {
+        return 0;
+    }
+
+    PyObject* s = PyUnicode_FromString(data);
+    /* Ignore exceptions until we have a valid string */
+    if (s == NULL) {
+        PyErr_Clear();
+        return 0;
+    }
+
+    /* Split on \n so we can test multiple lines */
+    PyObject* lines = PyObject_CallMethod(s, "split", "s", "\n");
+    if (lines == NULL) {
+        Py_DECREF(s);
+        return 0;
+    }
+
+    PyObject* reader = PyObject_CallMethod(csv_module, "reader", "N", lines);
+    if (reader) {
+        /* Consume all of the reader as an iterator */
+        PyObject* parsed_line;
+        while ((parsed_line = PyIter_Next(reader))) {
+            Py_DECREF(parsed_line);
+        }
+    }
+
+    /* Ignore csv.Error because we're probably going to generate
+       some bad files (embeded new-lines, unterminated quotes etc) */
+    if (PyErr_ExceptionMatches(csv_error)) {
+        PyErr_Clear();
+    }
+
+    Py_XDECREF(reader);
+    Py_DECREF(s);
+    return 0;
+}
+
 /* Run fuzzer and abort on failure. */
 static int _run_fuzz(const uint8_t *data, size_t size, int(*fuzzer)(const char* , size_t)) {
     int rv = fuzzer((const char*) data, size);
@@ -409,13 +409,13 @@ static int _run_fuzz(const uint8_t *data, size_t size, int(*fuzzer)(const char*
 /* CPython generates a lot of leak warnings for whatever reason. */
 int __lsan_is_turned_off(void) { return 1; }
 
- 
-int LLVMFuzzerInitialize(int *argc, char ***argv) { 
-    wchar_t* wide_program_name = Py_DecodeLocale(*argv[0], NULL); 
-    Py_SetProgramName(wide_program_name); 
-    return 0; 
-} 
- 
+
+int LLVMFuzzerInitialize(int *argc, char ***argv) {
+    wchar_t* wide_program_name = Py_DecodeLocale(*argv[0], NULL);
+    Py_SetProgramName(wide_program_name);
+    return 0;
+}
+
 /* Fuzz test interface.
    This returns the bitwise or of all fuzz test's return values.
 
@@ -442,59 +442,59 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
 #if !defined(_Py_FUZZ_ONE) || defined(_Py_FUZZ_fuzz_builtin_unicode)
     rv |= _run_fuzz(data, size, fuzz_builtin_unicode);
 #endif
-#if !defined(_Py_FUZZ_ONE) || defined(_Py_FUZZ_fuzz_struct_unpack) 
-    static int STRUCT_UNPACK_INITIALIZED = 0; 
-    if (!STRUCT_UNPACK_INITIALIZED && !init_struct_unpack()) { 
-        PyErr_Print(); 
-        abort(); 
-    } else { 
-        STRUCT_UNPACK_INITIALIZED = 1; 
-    } 
-    rv |= _run_fuzz(data, size, fuzz_struct_unpack); 
-#endif 
-#if !defined(_Py_FUZZ_ONE) || defined(_Py_FUZZ_fuzz_json_loads) 
-    static int JSON_LOADS_INITIALIZED = 0; 
-    if (!JSON_LOADS_INITIALIZED && !init_json_loads()) { 
-        PyErr_Print(); 
-        abort(); 
-    } else { 
-        JSON_LOADS_INITIALIZED = 1; 
-    } 
- 
-    rv |= _run_fuzz(data, size, fuzz_json_loads); 
-#endif 
-#if !defined(_Py_FUZZ_ONE) || defined(_Py_FUZZ_fuzz_sre_compile) 
-    static int SRE_COMPILE_INITIALIZED = 0; 
-    if (!SRE_COMPILE_INITIALIZED && !init_sre_compile()) { 
-        PyErr_Print(); 
-        abort(); 
-    } else { 
-        SRE_COMPILE_INITIALIZED = 1; 
-    } 
- 
-    rv |= _run_fuzz(data, size, fuzz_sre_compile); 
-#endif 
-#if !defined(_Py_FUZZ_ONE) || defined(_Py_FUZZ_fuzz_sre_match) 
-    static int SRE_MATCH_INITIALIZED = 0; 
-    if (!SRE_MATCH_INITIALIZED && !init_sre_match()) { 
-        PyErr_Print(); 
-        abort(); 
-    } else { 
-        SRE_MATCH_INITIALIZED = 1; 
-    } 
- 
-    rv |= _run_fuzz(data, size, fuzz_sre_match); 
-#endif 
-#if !defined(_Py_FUZZ_ONE) || defined(_Py_FUZZ_fuzz_csv_reader) 
-    static int CSV_READER_INITIALIZED = 0; 
-    if (!CSV_READER_INITIALIZED && !init_csv_reader()) { 
-        PyErr_Print(); 
-        abort(); 
-    } else { 
-        CSV_READER_INITIALIZED = 1; 
-    } 
- 
-    rv |= _run_fuzz(data, size, fuzz_csv_reader); 
-#endif 
+#if !defined(_Py_FUZZ_ONE) || defined(_Py_FUZZ_fuzz_struct_unpack)
+    static int STRUCT_UNPACK_INITIALIZED = 0;
+    if (!STRUCT_UNPACK_INITIALIZED && !init_struct_unpack()) {
+        PyErr_Print();
+        abort();
+    } else {
+        STRUCT_UNPACK_INITIALIZED = 1;
+    }
+    rv |= _run_fuzz(data, size, fuzz_struct_unpack);
+#endif
+#if !defined(_Py_FUZZ_ONE) || defined(_Py_FUZZ_fuzz_json_loads)
+    static int JSON_LOADS_INITIALIZED = 0;
+    if (!JSON_LOADS_INITIALIZED && !init_json_loads()) {
+        PyErr_Print();
+        abort();
+    } else {
+        JSON_LOADS_INITIALIZED = 1;
+    }
+
+    rv |= _run_fuzz(data, size, fuzz_json_loads);
+#endif
+#if !defined(_Py_FUZZ_ONE) || defined(_Py_FUZZ_fuzz_sre_compile)
+    static int SRE_COMPILE_INITIALIZED = 0;
+    if (!SRE_COMPILE_INITIALIZED && !init_sre_compile()) {
+        PyErr_Print();
+        abort();
+    } else {
+        SRE_COMPILE_INITIALIZED = 1;
+    }
+
+    rv |= _run_fuzz(data, size, fuzz_sre_compile);
+#endif
+#if !defined(_Py_FUZZ_ONE) || defined(_Py_FUZZ_fuzz_sre_match)
+    static int SRE_MATCH_INITIALIZED = 0;
+    if (!SRE_MATCH_INITIALIZED && !init_sre_match()) {
+        PyErr_Print();
+        abort();
+    } else {
+        SRE_MATCH_INITIALIZED = 1;
+    }
+
+    rv |= _run_fuzz(data, size, fuzz_sre_match);
+#endif
+#if !defined(_Py_FUZZ_ONE) || defined(_Py_FUZZ_fuzz_csv_reader)
+    static int CSV_READER_INITIALIZED = 0;
+    if (!CSV_READER_INITIALIZED && !init_csv_reader()) {
+        PyErr_Print();
+        abort();
+    } else {
+        CSV_READER_INITIALIZED = 1;
+    }
+
+    rv |= _run_fuzz(data, size, fuzz_csv_reader);
+#endif
   return rv;
 }