Skip to content

Fix decompression of files with multiple frames. #12

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

Fix decompression of files with multiple frames. #12

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
8 changes: 5 additions & 3 deletions zstd/decompress.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@ import ./common

{.pragma: c_dep_type, header: dep_header_name, bycopy.}
{.pragma: c_dep_proc, importc, header: dep_header_name, cdecl.}
{.pragma: c_dep_proc_noheader, importc, cdecl.} # skips the need for ZSTD_STATIC_LINKING_ONLY
{.pragma: c_dep_enum, size: sizeof(cint).}

proc ZSTD_getDecompressedSize*(a: ptr byte, b: csize_t): csize_t {.c_dep_proc.}
proc ZSTD_findDecompressedSize*(a: ptr byte, b: csize_t): clonglong {.c_dep_proc_noheader.}
proc ZSTD_getFrameContentSize*(a: ptr byte, b: csize_t): clonglong {.c_dep_proc.}
proc ZSTD_decompress*(a: ptr byte, b: csize_t, c: ptr byte, d: csize_t): csize_t {.c_dep_proc.}

Expand Down Expand Up @@ -41,7 +43,7 @@ proc free_decompress_stream*(strm: ptr ZSTD_DStream): csize_t =
proc decompress*(src: sink openArray[byte]): seq[byte] =
let src_ptr = unsafeAddr(src[0])
let src_cap = cast[csize_t](src.len)
let dst_cap = ZSTD_getFrameContentSize(src_ptr, src_cap)
let dst_cap = ZSTD_findDecompressedSize(src_ptr, src_cap)
case dst_cap:
of ZSTD_CONTENTSIZE_UNKNOWN:
assert(false, "ZSTD_CONTENTSIZE_UNKNOWN")
Expand All @@ -57,7 +59,7 @@ proc decompress*(src: sink openArray[byte]): seq[byte] =
proc decompress*(ctx: ptr ZSTD_DCtx, src: sink openArray[byte]): seq[byte] =
let src_ptr = unsafeAddr(src[0])
let src_cap = cast[csize_t](src.len)
let dst_cap = ZSTD_getFrameContentSize(src_ptr, src_cap)
let dst_cap = ZSTD_findDecompressedSize(src_ptr, src_cap)
case dst_cap:
of ZSTD_CONTENTSIZE_UNKNOWN:
assert(false, "ZSTD_CONTENTSIZE_UNKNOWN")
Expand All @@ -73,7 +75,7 @@ proc decompress*(ctx: ptr ZSTD_DCtx, src: sink openArray[byte]): seq[byte] =
proc decompress*(ctx: ptr ZSTD_DCtx, src: openArray[byte], dict: openArray[byte]): seq[byte] =
let src_ptr = unsafeAddr(src[0])
let src_cap = cast[csize_t](src.len)
let dst_cap = ZSTD_getFrameContentSize(src_ptr, src_cap)
let dst_cap = ZSTD_findDecompressedSize(src_ptr, src_cap)
case dst_cap:
of ZSTD_CONTENTSIZE_UNKNOWN:
assert(false, "ZSTD_CONTENTSIZE_UNKNOWN")
Expand Down