Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions crates/compression-codecs/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -97,3 +97,8 @@ pub trait Decode {
output: &mut PartialBuffer<impl AsRef<[u8]> + AsMut<[u8]>>,
) -> Result<bool>;
}

pub trait DecodedSize {
/// Returns the size of the input when uncompressed.
fn decoded_size(input: &[u8]) -> Result<u64>;
}
8 changes: 7 additions & 1 deletion crates/compression-codecs/src/lzma/decoder.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use crate::{Decode, Xz2Decoder};
use crate::{Decode, DecodedSize, Xz2Decoder};
use compression_core::util::PartialBuffer;
use std::{convert::TryInto, io::Result};

Expand Down Expand Up @@ -61,3 +61,9 @@ impl Decode for LzmaDecoder {
self.inner.finish(output)
}
}

impl DecodedSize for LzmaDecoder {
fn decoded_size(input: &[u8]) -> Result<u64> {
Xz2Decoder::decoded_size(input)
}
}
8 changes: 7 additions & 1 deletion crates/compression-codecs/src/xz/decoder.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use crate::{Decode, Xz2Decoder};
use crate::{Decode, DecodedSize, Xz2Decoder};
use compression_core::util::PartialBuffer;
use std::{
convert::TryInto,
Expand Down Expand Up @@ -97,3 +97,9 @@ impl Decode for XzDecoder {
self.inner.finish(output)
}
}

impl DecodedSize for XzDecoder {
fn decoded_size(input: &[u8]) -> Result<u64> {
Xz2Decoder::decoded_size(input)
}
}
15 changes: 13 additions & 2 deletions crates/compression-codecs/src/xz2/decoder.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
use crate::{lzma::params::LzmaDecoderParams, Decode};
use crate::{lzma::params::LzmaDecoderParams, Decode, DecodedSize};
use compression_core::util::PartialBuffer;
use liblzma::stream::{Action, Status, Stream};
use std::{convert::TryFrom, fmt, io};
use std::{
convert::TryFrom,
fmt,
io::{self, Cursor},
};

/// Xz2 decoding stream
pub struct Xz2Decoder {
Expand Down Expand Up @@ -108,6 +112,13 @@ impl Decode for Xz2Decoder {
}
}

impl DecodedSize for Xz2Decoder {
fn decoded_size(input: &[u8]) -> io::Result<u64> {
let cursor = Cursor::new(input);
liblzma::uncompressed_size(cursor)
}
}

#[cfg(test)]
mod tests {
use std::convert::TryFrom;
Expand Down
15 changes: 14 additions & 1 deletion crates/compression-codecs/src/zstd/decoder.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
use crate::zstd::params::DParameter;
use crate::Decode;
use crate::{Decode, DecodedSize};
use compression_core::unshared::Unshared;
use compression_core::util::PartialBuffer;
use libzstd::stream::raw::{Decoder, Operation};
use std::convert::TryInto;
use std::io;
use std::io::Result;
use zstd_safe::get_error_name;

#[derive(Debug)]
pub struct ZstdDecoder {
Expand Down Expand Up @@ -84,3 +86,14 @@ impl Decode for ZstdDecoder {
Ok(bytes_left == 0)
}
}

impl DecodedSize for ZstdDecoder {
fn decoded_size(input: &[u8]) -> Result<u64> {
zstd_safe::find_frame_compressed_size(input)
.map_err(|error_code| io::Error::other(get_error_name(error_code)))
.and_then(|size| {
size.try_into()
.map_err(|_| io::Error::from(io::ErrorKind::FileTooLarge))
})
}
}