Skip to content

Fix error in decompressing RDS files that decompress to more than UINT_MAX bytes #49

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
elaude wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix error in decompressing RDS files that decompress to more than UINT_MAX bytes #49

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
6 changes: 5 additions & 1 deletion src/rdata_read.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,14 +241,18 @@ static ssize_t read_st_compression(rdata_ctx_t *ctx, void *buffer, size_t len) {

#if HAVE_ZLIB
static ssize_t read_st_z(rdata_ctx_t *ctx, void *buffer, size_t len) {
const uInt max = (uInt)-1;
ssize_t bytes_written = 0;
int error = 0;
int result = Z_OK;
while (1) {
long start_out = ctx->z_strm->total_out;

ctx->z_strm->next_out = (unsigned char *)buffer + bytes_written;
ctx->z_strm->avail_out = len - bytes_written;
if (ctx->z_strm->avail_out == 0) {
ssize_t left = len - bytes_written;
ctx->z_strm->avail_out = left > (ssize_t)max ? max : (uInt)left;
}

result = inflate(ctx->z_strm, Z_SYNC_FLUSH);

Expand Down