Skip to content

libvncclient: fix memory leak in CompressClipData (#647) #648

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
bk138 merged 1 commit into from
Feb 6, 2025
Merged

libvncclient: fix memory leak in CompressClipData (#647) #648

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
28 changes: 14 additions & 14 deletions src/libvncclient/rfbclient.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1815,26 +1815,26 @@ static int
CompressClipData(Bytef *dest, uLongf *destLen, Bytef *source, uLong sourceLen)
{
int ret;
z_stream *zs = (z_stream*)malloc(sizeof(z_stream));
memset(zs, 0, sizeof(z_stream));
z_stream zs;
memset(&zs, 0, sizeof(z_stream));

zs->zfree = Z_NULL;
zs->zalloc = Z_NULL;
zs->opaque = Z_NULL;
ret = deflateInit(zs, Z_DEFAULT_COMPRESSION);
zs.zfree = Z_NULL;
zs.zalloc = Z_NULL;
zs.opaque = Z_NULL;
ret = deflateInit(&zs, Z_DEFAULT_COMPRESSION);
if (ret == Z_OK) {
zs->avail_in = sourceLen;
zs->next_in = source;
zs->avail_out = *destLen;
zs->next_out = dest;
zs.avail_in = sourceLen;
zs.next_in = source;
zs.avail_out = *destLen;
zs.next_out = dest;

do {
// Using Z_SYNC_FLUSH instead of Z_FINISH is the key here.
ret = deflate(zs, Z_SYNC_FLUSH);
} while (ret >= 0 && zs->avail_in > 0);
ret = deflate(&zs, Z_SYNC_FLUSH);
} while (ret >= 0 && zs.avail_in > 0);

*destLen = zs->total_out;
deflateEnd(zs);
*destLen = zs.total_out;
deflateEnd(&zs);
}
return ret;
}
Expand Down
Loading