Skip to content

replace assert() with error handling, fix memory leaks and correctness bugs #93

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
rafaelvanoni wants to merge 12 commits into
base: next
Choose a base branch
from
Open

replace assert() with error handling, fix memory leaks and correctness bugs #93

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d8add91
replace assert() with error handling in writer, sorter, and zlib deco…
Aug 14, 2026
81c3d25
fix zstd decompression sentinel check and compression buffer size guard
Aug 14, 2026
a5f4837
fix memory leak in sorter when merge callback returns NULL
Aug 14, 2026
5c71572
check return values of get_block_at_index and pthread_create
Aug 14, 2026
e571c81
report error and exit when user merge function returns NULL
Aug 14, 2026
3544ba8
fix output stream, argument parsing, and bounds check in CLI tools
Aug 14, 2026
4d640bb
detect early termination in mtbl_merge
Aug 14, 2026
be8cb71
add error messages to mtbl_reader_init and mtbl_merge on open failure
Aug 14, 2026
be5cc47
test-merge.sh should exit, not return
Aug 15, 2026
df70249
fix mem leak in _mtbl_sorter_write_chunk()
Aug 15, 2026
bdfbc95
revert s/assert/exit changes
Aug 19, 2026
bb9fa3d
remove fprintf(3) calls in mtbl_reader_init
Aug 19, 2026
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
10 changes: 8 additions & 2 deletions mtbl/reader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,11 +224,17 @@ mtbl_reader_init(const char *fname, const struct mtbl_reader_options *opt)
int fd;

fd = open(fname, O_RDONLY);
if (fd < 0)
if (fd < 0) {
fprintf(stderr, "%s: ERROR: failed to open(2) '%s': %s\n", __func__, fname, strerror(errno));

@edmonds edmonds Aug 19, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is library code. Libraries should not be writing to stdout/stderr.

return (NULL);
}

r = mtbl_reader_init_fd(fd, opt);
close(fd);
if (r == NULL) {
fprintf(stderr, "%s: ERROR: failed to init mtbl fd for '%s'\n", __func__, fname);
}

close(fd);
return (r);
}

Expand Down
5 changes: 3 additions & 2 deletions src/mtbl_merge.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,8 +456,9 @@ main(int argc, char **argv)
fprintf(stderr, "%s: opening input file %s\n", program_name, fname);
readers[i] = mtbl_reader_init(fname, NULL);
if (readers[i] == NULL) {
fprintf(stderr, "Error: mtbl_reader_init() failed.\n\n");
usage();
fprintf(stderr, "%s: ERROR: mtbl_reader_init() failed to open file %s\n\n",
program_name, fname);
exit(EXIT_FAILURE);
}
mtbl_merger_add_source(merger, mtbl_reader_source(readers[i]));
total_input_entries += mtbl_metadata_count_entries(mtbl_reader_metadata(readers[i]));
Expand Down