github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge 412d435b84 into b519ce04e3

pull/2268/merge
Joseph Chris 2024-11-28 05:31:26 -08:00 committed by GitHub
parent b519ce04e3 412d435b84
commit c0a58b67da
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/GZipDecodingStreamFilter.cc
View File

@ -48,6 +48,7 @@ GZipDecodingStreamFilter::GZipDecodingStreamFilter(
: StreamFilter{std::move(delegate)}, : StreamFilter{std::move(delegate)},
strm_{nullptr}, strm_{nullptr},
finished_{false}, finished_{false},
rawMode_{false},
bytesProcessed_{0} bytesProcessed_{0}
{ {
} }
@ -66,7 +67,8 @@ void GZipDecodingStreamFilter::init()
strm_->next_in = Z_NULL; strm_->next_in = Z_NULL;
// initialize z_stream with gzip/zlib format auto detection enabled. // initialize z_stream with gzip/zlib format auto detection enabled.
if (Z_OK != inflateInit2(strm_, 47)) { // negative windowBits enables raw mode support.
if (Z_OK != inflateInit2(strm_, rawMode_ ? -15 : 47)) {
throw DL_ABORT_EX("Initializing z_stream failed."); throw DL_ABORT_EX("Initializing z_stream failed.");
} }
} }
@ -105,6 +107,12 @@ GZipDecodingStreamFilter::transform(const std::shared_ptr<BinaryStream>& out,
finished_ = true; finished_ = true;
} }
else if (ret != Z_OK && ret != Z_BUF_ERROR) { else if (ret != Z_OK && ret != Z_BUF_ERROR) {
if (!rawMode_) {
// reset in raw mode
rawMode_ = true;
init();
return transform(out, segment, inbuf, inlen);
}
throw DL_ABORT_EX(fmt("libz::inflate() failed. cause:%s", strm_->msg)); throw DL_ABORT_EX(fmt("libz::inflate() failed. cause:%s", strm_->msg));
} }

2
src/GZipDecodingStreamFilter.h
View File

@ -49,6 +49,8 @@ private:
bool finished_; bool finished_;
bool rawMode_;
size_t bytesProcessed_; size_t bytesProcessed_;
static const size_t OUTBUF_LENGTH = 16_k; static const size_t OUTBUF_LENGTH = 16_k;