Skip to content

Add BrotliDecompressStreamUninit for uninitialized buffer #41

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

Add BrotliDecompressStreamUninit for uninitialized buffer #41

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
35 changes: 31 additions & 4 deletions src/decode.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1693,7 +1693,7 @@ fn WriteRingBuffer<'a,
AllocU32: alloc::Allocator<u32>,
AllocHC: alloc::Allocator<HuffmanCode>>(
available_out: &mut usize,
opt_output: Option<&mut [u8]>,
opt_output: Option<&mut [mem::MaybeUninit<u8>]>,
output_offset: &mut usize,
total_out: &mut usize,
force: bool,
Expand All @@ -1711,7 +1711,9 @@ fn WriteRingBuffer<'a,
let start = fast_slice!((s.ringbuffer)[start_index ; start_index + num_written as usize]);
if let Some(output) = opt_output {
fast_mut!((output)[*output_offset ; *output_offset + num_written as usize])
.clone_from_slice(start);
.iter_mut()
.zip(start)
.for_each(|(maybe_uninit, byte)| { maybe_uninit.write(*byte); });
}
*output_offset += num_written;
*available_out -= num_written;
Expand Down Expand Up @@ -1753,7 +1755,7 @@ fn CopyUncompressedBlockToOutput<AllocU8: alloc::Allocator<u8>,
AllocU32: alloc::Allocator<u32>,
AllocHC: alloc::Allocator<HuffmanCode>>
(mut available_out: &mut usize,
mut output: &mut [u8],
mut output: &mut [mem::MaybeUninit<u8>],
mut output_offset: &mut usize,
mut total_out: &mut usize,
mut s: &mut BrotliState<AllocU8, AllocU32, AllocHC>,
Expand Down Expand Up @@ -2664,12 +2666,37 @@ pub fn BrotliMaxDistanceSymbol(ndirect: u32, npostfix: u32) -> u32{
pub fn BrotliDecompressStream<AllocU8: alloc::Allocator<u8>,
AllocU32: alloc::Allocator<u32>,
AllocHC: alloc::Allocator<HuffmanCode>>
(available_in: &mut usize,
input_offset: &mut usize,
xinput: &[u8],
available_out: &mut usize,
output_offset: &mut usize,
output: &mut [u8],
total_out: &mut usize,
s: &mut BrotliState<AllocU8, AllocU32, AllocHC>)
-> BrotliResult {
BrotliDecompressStreamUninit(
available_in,
input_offset,
xinput,
available_out,
output_offset,
// SAFETY: brotli never writes uninitialized buffer to already initialized `output`
unsafe { &mut *(output as *mut _ as *mut [mem::MaybeUninit<u8>]) },
total_out,
s,
)
}

pub fn BrotliDecompressStreamUninit<AllocU8: alloc::Allocator<u8>,
AllocU32: alloc::Allocator<u32>,
AllocHC: alloc::Allocator<HuffmanCode>>
(available_in: &mut usize,
input_offset: &mut usize,
xinput: &[u8],
mut available_out: &mut usize,
mut output_offset: &mut usize,
mut output: &mut [u8],
mut output: &mut [mem::MaybeUninit<u8>],
mut total_out: &mut usize,
mut s: &mut BrotliState<AllocU8, AllocU32, AllocHC>)
-> BrotliResult {
Expand Down