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

ChunkedDecodingStreamFilter: be aware of segments 

See GH-1582
Report the correct bytesProcessed_ taking into account
getDelagate()->getBytesProcessed()
Also, rewrite to avoid using goto or modifying for-loop variables.
pull/1583/head
Ali MJ Al-Nasrawy 2020-03-09 21:15:09 +03:00
parent 9d0a48ac81
commit dd7ed38c90
1 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/ChunkedDecodingStreamFilter.cc
View File

@ -84,10 +84,31 @@ ChunkedDecodingStreamFilter::transform(const std::shared_ptr<BinaryStream>& out,
const unsigned char* inbuf, size_t inlen) const unsigned char* inbuf, size_t inlen)
{ {
ssize_t outlen = 0; ssize_t outlen = 0;
size_t i;
bytesProcessed_ = 0; bytesProcessed_ = 0;
for (i = 0; i < inlen; ++i) { while (bytesProcessed_ < inlen) {
unsigned char c = inbuf[i]; if (state_ == CHUNKS_COMPLETE) {
break;
}
if (state_ == CHUNK) {
int64_t readlen = std::min(chunkRemaining_,
static_cast<int64_t>(inlen - bytesProcessed_));
outlen += getDelegate()->transform(out, segment, inbuf + bytesProcessed_,
readlen);
int64_t processedlen = getDelegate()->getBytesProcessed();
bytesProcessed_ += processedlen;
chunkRemaining_ -= processedlen;
if (chunkRemaining_ == 0) {
state_ = PREV_CHUNK_CR;
}
if (processedlen < readlen) {
// segment download finished
break;
}
continue;
}
// The following states consume single char
unsigned char c = inbuf[bytesProcessed_];
bytesProcessed_++;
switch (state_) { switch (state_) {
case PREV_CHUNK_SIZE: case PREV_CHUNK_SIZE:
if (util::isHexDigit(c)) { if (util::isHexDigit(c)) {
@ -136,17 +157,6 @@ ChunkedDecodingStreamFilter::transform(const std::shared_ptr<BinaryStream>& out,
"missing LF at the end of chunk size"); "missing LF at the end of chunk size");
} }
break; break;
case CHUNK: {
int64_t readlen =
std::min(chunkRemaining_, static_cast<int64_t>(inlen - i));
outlen += getDelegate()->transform(out, segment, inbuf + i, readlen);
chunkRemaining_ -= readlen;
i += readlen - 1;
if (chunkRemaining_ == 0) {
state_ = PREV_CHUNK_CR;
}
break;
}
case PREV_CHUNK_CR: case PREV_CHUNK_CR:
if (c == '\r') { if (c == '\r') {
state_ = PREV_CHUNK_LF; state_ = PREV_CHUNK_LF;
@ -203,15 +213,12 @@ ChunkedDecodingStreamFilter::transform(const std::shared_ptr<BinaryStream>& out,
"missing LF at the end of chunks"); "missing LF at the end of chunks");
} }
break; break;
case CHUNKS_COMPLETE:
goto fin;
default: default:
// unreachable // unreachable
assert(0); assert(0);
} }
} }
fin:
bytesProcessed_ += i;
return outlen; return outlen;
} }