Skip to content

Commit 0fe6cb6

Browse files
committed
Add fuzzer for json_encode module
1 parent 71ede86 commit 0fe6cb6

3 files changed

Lines changed: 86 additions & 2 deletions

File tree

Makefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
all : fuzzer-html fuzzer-email fuzzer-httpclient fuzzer-json fuzzer-difflib fuzzer-csv fuzzer-decode fuzzer-ast fuzzer-tarfile fuzzer-tarfile-hypothesis fuzzer-zipfile fuzzer-zipfile-hypothesis fuzzer-re fuzzer-configparser fuzzer-tomllib fuzzer-plistlib fuzzer-xml fuzzer-zoneinfo
1+
all : fuzzer-html fuzzer-email fuzzer-httpclient fuzzer-json fuzzer-difflib fuzzer-csv fuzzer-decode fuzzer-ast fuzzer-tarfile fuzzer-tarfile-hypothesis fuzzer-zipfile fuzzer-zipfile-hypothesis fuzzer-re fuzzer-configparser fuzzer-tomllib fuzzer-plistlib fuzzer-xml fuzzer-zoneinfo fuzzer-json-encode
22

33
PYTHON_CONFIG_PATH=$(CPYTHON_INSTALL_PATH)/bin/python3-config
44
CXXFLAGS += $(shell $(PYTHON_CONFIG_PATH) --cflags)
5-
LDFLAGS += -rdynamic $(shell $(PYTHON_CONFIG_PATH) --ldflags --embed)
5+
LDFLAGS += -rdynamic $(shell $(PYTHON_CONFIG_PATH) --ldflags --embed) $(CPYTHON_MODLIBS) -Wl,--allow-multiple-definition
66

77
fuzzer-html:
88
clang++ $(CXXFLAGS) $(LIB_FUZZING_ENGINE) -std=c++17 fuzzer.cpp -DPYTHON_HARNESS_PATH="\"html.py\"" -ldl $(LDFLAGS) -o fuzzer-html
@@ -40,3 +40,6 @@ fuzzer-xml:
4040
clang++ $(CXXFLAGS) $(LIB_FUZZING_ENGINE) -std=c++17 fuzzer.cpp -DPYTHON_HARNESS_PATH="\"xml.py\"" -ldl $(LDFLAGS) -o fuzzer-xml
4141
fuzzer-zoneinfo:
4242
clang++ $(CXXFLAGS) $(LIB_FUZZING_ENGINE) -std=c++17 fuzzer.cpp -DPYTHON_HARNESS_PATH="\"zoneinfo.py\"" -ldl $(LDFLAGS) -o fuzzer-zoneinfo
43+
44+
fuzzer-json-encode:
45+
clang++ $(CXXFLAGS) $(LIB_FUZZING_ENGINE) -std=c++17 fuzzer.cpp -DPYTHON_HARNESS_PATH="\"json_encode.py\"" -ldl $(LDFLAGS) -o fuzzer-json-encode

fuzz_targets.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ email email.py
77
html html.py
88
httpclient httpclient.py
99
json json.py
10+
json-encode json_encode.py
1011
plistlib plist.py
1112
re re.py
1213
tarfile tarfile.py

json_encode.py

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
from fuzzeddataprovider import FuzzedDataProvider
2+
import json
3+
4+
# Container type constants for build_container
5+
CONTAINER_INT_LIST = 0
6+
CONTAINER_STRING = 1
7+
CONTAINER_DICT = 2
8+
CONTAINER_TUPLE = 3
9+
CONTAINER_FLOAT = 4
10+
CONTAINER_INT = 5
11+
12+
# Encode operation constants for FuzzerRunOne
13+
ENCODE_DEFAULT = 0
14+
ENCODE_ASCII = 1
15+
ENCODE_NON_ASCII = 2
16+
ENCODE_SORTED = 3
17+
ENCODE_INDENTED = 4
18+
ENCODE_CUSTOM = 5
19+
20+
def build_container(fdp):
21+
ctype = fdp.ConsumeIntInRange(CONTAINER_INT_LIST, CONTAINER_INT)
22+
if ctype == CONTAINER_INT_LIST:
23+
n = fdp.ConsumeIntInRange(0, min(fdp.remaining_bytes(), 200))
24+
return fdp.ConsumeIntList(n, 1)
25+
elif ctype == CONTAINER_STRING:
26+
n = fdp.ConsumeIntInRange(1, min(fdp.remaining_bytes(), 1000)) if fdp.remaining_bytes() > 0 else 0
27+
return fdp.ConsumeBytes(n).decode('latin-1') if n > 0 else ""
28+
elif ctype == CONTAINER_DICT:
29+
n = fdp.ConsumeIntInRange(0, min(fdp.remaining_bytes(), 50))
30+
d = {}
31+
for _ in range(n):
32+
if fdp.remaining_bytes() == 0:
33+
break
34+
kn = fdp.ConsumeIntInRange(1, min(fdp.remaining_bytes(), 20))
35+
key = fdp.ConsumeBytes(kn).decode('latin-1')
36+
val = fdp.ConsumeRandomValue()
37+
d[key] = val
38+
return d
39+
elif ctype == CONTAINER_TUPLE:
40+
n = fdp.ConsumeIntInRange(0, min(fdp.remaining_bytes(), 200))
41+
return tuple(fdp.ConsumeIntList(n, 1))
42+
elif ctype == CONTAINER_FLOAT:
43+
return fdp.ConsumeFloat()
44+
else:
45+
return fdp.ConsumeInt(4)
46+
47+
# Fuzzes the _json C module's encoding paths (Modules/_json.c).
48+
# Builds Python containers (int lists, string dicts, tuples, floats)
49+
# from fuzzed data and encodes them with json.dumps() using varied
50+
# options (ensure_ascii, sort_keys, indent) and custom JSONEncoder
51+
# settings (separators, allow_nan, default handler).
52+
def FuzzerRunOne(FuzzerInput):
53+
if len(FuzzerInput) < 1 or len(FuzzerInput) > 0x100000:
54+
return
55+
fdp = FuzzedDataProvider(FuzzerInput)
56+
target = fdp.ConsumeIntInRange(ENCODE_DEFAULT, ENCODE_CUSTOM)
57+
try:
58+
obj = build_container(fdp)
59+
if target == ENCODE_DEFAULT:
60+
json.dumps(obj)
61+
elif target == ENCODE_ASCII:
62+
json.dumps(obj, ensure_ascii=True)
63+
elif target == ENCODE_NON_ASCII:
64+
json.dumps(obj, ensure_ascii=False)
65+
elif target == ENCODE_SORTED:
66+
json.dumps(obj, sort_keys=True)
67+
elif target == ENCODE_INDENTED:
68+
indent = fdp.ConsumeIntInRange(0, 8)
69+
json.dumps(obj, indent=indent)
70+
else:
71+
enc = json.JSONEncoder(
72+
ensure_ascii=fdp.ConsumeBool(),
73+
sort_keys=fdp.ConsumeBool(),
74+
indent=fdp.ConsumeIntInRange(0, 4) if fdp.ConsumeBool() else None,
75+
)
76+
enc.encode(obj)
77+
except (ValueError, TypeError, RecursionError, OverflowError):
78+
pass
79+
except Exception:
80+
pass

0 commit comments

Comments
 (0)