Skip to content

extmod/modjson: Detect unterminated composite entities. #17148

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

Merged
merged 1 commit into from
May 20, 2025
Merged

extmod/modjson: Detect unterminated composite entities. #17148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion extmod/modjson.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,8 @@ static mp_obj_t mod_json_load(mp_obj_t stream_obj) {
for (;;) {
cont:
if (S_END(s)) {
break;
// Input finished abruptly in the middle of a composite entity.
goto fail;
}
mp_obj_t next = MP_OBJ_NULL;
bool enter = false;
Expand Down
24 changes: 24 additions & 0 deletions tests/extmod/json_loads.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,3 +71,27 @@ def my_print(o):
my_print(json.loads("[null] a"))
except ValueError:
print("ValueError")

# incomplete object declaration
try:
my_print(json.loads('{"a":0,'))
except ValueError:
print("ValueError")

# incomplete nested array declaration
try:
my_print(json.loads('{"a":0, ['))
except ValueError:
print("ValueError")

# incomplete array declaration
try:
my_print(json.loads('[0,'))
except ValueError:
print("ValueError")

# incomplete nested object declaration
try:
my_print(json.loads('[0, {"a":0, '))
except ValueError:
print("ValueError")
Loading