Skip to content
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

Jump to bottom

ffi/zstd: fix possible leak on error #1666

Merged
merged 1 commit into from
Oct 12, 2023
Merged

ffi/zstd: fix possible leak on error #1666

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
10 changes: 8 additions & 2 deletions ffi/zstd.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@ function zstd.zstd_compress(ptr, size)
assert(cbuff ~= nil, "Failed to allocate ZSTD compression buffer (" .. tonumber(n) .. " bytes)")
-- NOTE: We should be quite all right with the default (3), which will most likely trounce zlib's 9 in every respect...
local clen = zst.ZSTD_compress(cbuff, n, ptr, size, zst.ZSTD_CLEVEL_DEFAULT)
assert(zst.ZSTD_isError(clen) == 0, ffi.string(zst.ZSTD_getErrorName(clen)))
if zst.ZSTD_isError(clen) ~= 0 then
C.free(cbuff)
error(ffi.string(zst.ZSTD_getErrorName(clen)))
end
return cbuff, clen
end

Expand All @@ -40,7 +43,10 @@ function zstd.zstd_uncompress(ptr, size)
local buff = C.calloc(n, 1)
assert(buff ~= nil, "Failed to allocate ZSTD decompression buffer (" .. tonumber(n) .. " bytes)")
local ulen = zst.ZSTD_decompress(buff, n, ptr, size)
assert(zst.ZSTD_isError(ulen) == 0, ffi.string(zst.ZSTD_getErrorName(ulen)))
if zst.ZSTD_isError(ulen) ~= 0 then
C.free(buff)
error(ffi.string(zst.ZSTD_getErrorName(ulen)))
end
return buff, ulen
end

Expand Down
Loading