DevComp/zip-rs-wasm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix(lzma): fixed panic in case of invalid lzma stream (#259)

Browse source 
Co-authored-by: Chris Hennick <4961925+Pr0methean@users.noreply.github.com>
This commit is contained in:
Radmir 2024-11-19 22:55:47 +03:00 • committed by GitHub
parent 0ea2744c89
commit ff877df425
Signed by: DevComp
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/read/lzma.rs
View file

@ -1,6 +1,6 @@
use lzma_rs::decompress::{Options, Stream, UnpackedSize}; use lzma_rs::decompress::{Options, Stream, UnpackedSize};
use std::collections::VecDeque; use std::collections::VecDeque;
use std::io::{BufRead, Read, Result, Write}; use std::io::{BufRead, Error, ErrorKind, Read, Result, Write};
const OPTIONS: Options = Options { const OPTIONS: Options = Options {
unpacked_size: UnpackedSize::ReadFromHeader, unpacked_size: UnpackedSize::ReadFromHeader,
@ -29,7 +29,11 @@ impl<R: Read> LzmaDecoder<R> {
impl<R: BufRead> Read for LzmaDecoder<R> { impl<R: BufRead> Read for LzmaDecoder<R> {
fn read(&mut self, buf: &mut [u8]) -> Result<usize> { fn read(&mut self, buf: &mut [u8]) -> Result<usize> {
let mut bytes_read = self.stream.get_output_mut().unwrap().read(buf)?; let mut bytes_read = self
.stream
.get_output_mut()
.ok_or(Error::new(ErrorKind::InvalidData, "Invalid LZMA stream"))?
.read(buf)?;
while bytes_read < buf.len() { while bytes_read < buf.len() {
let compressed_bytes = self.compressed_reader.fill_buf()?; let compressed_bytes = self.compressed_reader.fill_buf()?;
if compressed_bytes.is_empty() { if compressed_bytes.is_empty() {