Skip to content

util: do not parse truncated input on append failure #185

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

Open
prownd wants to merge 1 commit into
base: main
Choose a base branch
from
Open

util: do not parse truncated input on append failure #185

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
7 changes: 6 additions & 1 deletion json_util.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,12 @@ struct fjson_object* fjson_object_from_fd(int fd)
return NULL;
}
while((ret = read(fd, buf, FJSON_FILE_BUF_SIZE)) > 0) {
printbuf_memappend(pb, buf, ret);
if(printbuf_memappend(pb, buf, ret) < 0) {
/* do not silently parse truncated input on OOM */
MC_ERROR("fjson_object_from_fd: printbuf_memappend failed\n");
printbuf_free(pb);
return NULL;
}
}
if(ret < 0) {
MC_ERROR("fjson_object_from_fd: error reading fd %d: %s\n", fd, strerror(errno));
Expand Down