Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

gh-73691: Increase size limits in _xxtestfuzz #99070

Merged
merged 4 commits into from
Nov 3, 2022
Merged

gh-73691: Increase size limits in _xxtestfuzz #99070

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
043cb05
Increase size limits in _xxtestfuzz.
gpshead Nov 3, 2022
8dcc689
restore original comment, no need to edit it
gpshead Nov 3, 2022
c95a5d9
comment typo
gpshead Nov 3, 2022
4d6a237
Merge branch 'main' into json-fuzzier
gpshead Nov 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions Modules/_xxtestfuzz/fuzzer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ static int fuzz_struct_unpack(const char* data, size_t size) {
}


#define MAX_JSON_TEST_SIZE 0x10000
#define MAX_JSON_TEST_SIZE 0x100000

PyObject* json_loads_method = NULL;
/* Called by LLVMFuzzerTestOneInput for initialization */
Expand All @@ -157,9 +157,7 @@ static int init_json_loads(void) {
}
/* 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)` */
/* long inputs could lead to timeouts on boring inputs */
if (size > MAX_JSON_TEST_SIZE) {
return 0;
}
Expand Down Expand Up @@ -335,7 +333,7 @@ static int fuzz_sre_match(const char* data, size_t size) {
return 0;
}

#define MAX_CSV_TEST_SIZE 0x10000
#define MAX_CSV_TEST_SIZE 0x100000
PyObject* csv_module = NULL;
PyObject* csv_error = NULL;
/* Called by LLVMFuzzerTestOneInput for initialization */
Expand Down Expand Up @@ -393,7 +391,7 @@ static int fuzz_csv_reader(const char* data, size_t size) {
return 0;
}

#define MAX_AST_LITERAL_EVAL_TEST_SIZE 0x10000
#define MAX_AST_LITERAL_EVAL_TEST_SIZE 0x100000
PyObject* ast_literal_eval_method = NULL;
/* Called by LLVMFuzzerTestOneInput for initialization */
static int init_ast_literal_eval(void) {
Expand Down Expand Up @@ -459,6 +457,9 @@ int LLVMFuzzerInitialize(int *argc, char ***argv) {
PyConfig config;
PyConfig_InitPythonConfig(&config);
config.install_signal_handlers = 0;
/* Raise the limit above the default allow exercising larger things
* now that we fall back to the _pylong module for large values. */
config.int_max_str_digits = 8086;
PyStatus status;
status = PyConfig_SetBytesString(&config, &config.program_name, *argv[0]);
if (PyStatus_Exception(status)) {
Expand Down