From 2691e142f4a881b470e7d5e889ef4ca4a589cadf Mon Sep 17 00:00:00 2001 From: Randy Date: Thu, 11 Jul 2019 14:42:27 +0200 Subject: [PATCH] update fuzzer --- fuzzing/cjson_read_fuzzer.cc | 38 +++++++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/fuzzing/cjson_read_fuzzer.cc b/fuzzing/cjson_read_fuzzer.cc index d7af5c2..be2fe67 100644 --- a/fuzzing/cjson_read_fuzzer.cc +++ b/fuzzing/cjson_read_fuzzer.cc @@ -1,30 +1,38 @@ #include #include +#include #include "../cJSON.h" extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { - if((data[0] == '\0') || (size < 3) || (data[1] == '\0')) return 0; + size_t offset = 4; - cJSON *json = cJSON_Parse((const char*)data + 2); + if(size < offset) return 0; + if(data[0] != '1' && data[0] != '0') return 0; + if(data[1] != '1' && data[1] != '0') return 0; + if(data[2] != '1' && data[2] != '0') return 0; + if(data[3] != '1' && data[3] != '0') return 0; + + int minify = data[0] == '1' ? 1 : 0; + int require_termination = data[1] == '1' ? 1 : 0; + int formatted = data[2] == '1' ? 1 : 0; + int buffered = data[3] == '1' ? 1 : 0; + + cJSON *json = cJSON_ParseWithOpts((const char*)data + offset, NULL, require_termination); if(json == NULL) return 0; - int do_format = 0; char *printed_json = NULL; - if(data[1] == 'f') do_format = 1; - - if(data[0] == 'b') + if(buffered) { - /* buffered printing */ - printed_json = cJSON_PrintBuffered(json, 1, do_format); + printed_json = cJSON_PrintBuffered(json, 1, formatted); } else { /* unbuffered printing */ - if(do_format) + if(formatted) { printed_json = cJSON_Print(json); } @@ -35,6 +43,18 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) } if(printed_json != NULL) free(printed_json); + + if(minify) + { + unsigned char *copied = (unsigned char*)malloc(size); + + memcpy(copied, data + offset, size); + + cJSON_Minify((char*)printed_json); + free(copied); + } + + cJSON_Delete(json); return 0; -- GitLab