Skip to content

Detect truncated frames to avoid infinite loop #47

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
merged 3 commits into from
May 19, 2024
Merged

Detect truncated frames to avoid infinite loop #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
25d60e2
detect truncated frames
nhz2 May 18, 2024
1af090f
add check that code > 0
nhz2 May 19, 2024
a62e8c9
fix tests for 1.6
nhz2 May 19, 2024
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
9 changes: 8 additions & 1 deletion src/decompression.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,14 @@ function TranscodingStreams.process(codec::ZstdDecompressor, input::Memory, outp
error[] = ErrorException("zstd error")
return Δin, Δout, :error
else
return Δin, Δout, code == 0 ? :end : :ok
if code == 0
return Δin, Δout, :end
elseif input.size == 0 && code > 0
error[] = ErrorException("zstd frame truncated. Expected at least $(code) more bytes")
return Δin, Δout, :error
else
return Δin, Δout, :ok
end
end
end

Expand Down
16 changes: 16 additions & 0 deletions test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ using Random
using TranscodingStreams
using Test

Random.seed!(1234)

@testset "Zstd Codec" begin
codec = ZstdCompressor()
@test codec isa ZstdCompressor
Expand All @@ -20,6 +22,20 @@ using Test
@test read(ZstdDecompressorStream(IOBuffer(data))) == b"foo"
@test read(ZstdDecompressorStream(IOBuffer(vcat(data, data)))) == b"foofoo"

@testset "Truncated frames" begin
# issue #24
@test_throws ErrorException transcode(ZstdDecompressor, UInt8[])
for trial in 1:1000
local uncompressed_data = rand(UInt8, rand(0:100))
local compressed_data = transcode(ZstdCompressor, uncompressed_data)
local L = length(compressed_data)
for n in 0:L-1
@test_throws ErrorException transcode(ZstdDecompressor, compressed_data[1:n])
end
@test transcode(ZstdDecompressor, compressed_data) == uncompressed_data
end
end

@test ZstdCompressorStream <: TranscodingStreams.TranscodingStream
@test ZstdDecompressorStream <: TranscodingStreams.TranscodingStream

Expand Down