dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2025-02-13 07:22:52 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Catch an error in DecodeImageData().

Browse Source 
When we are at end-of-stream, but haven't decoded all pixels, we should
return an error.
Also remove an obsolete TODO.

Change-Id: I3fb1646136e706da536d537a54d1fa487a890630
This commit is contained in:
Urvang Joshi 2012-05-11 14:08:40 +05:30
parent ac8e5e42d1
commit 9f547450e0
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/dec/vp8l.c
View File

@ -596,14 +596,12 @@ static int DecodeImageData(VP8LDecoder* const dec,
const int length_sym = code - NUM_LITERAL_CODES; const int length_sym = code - NUM_LITERAL_CODES;
const int length = GetCopyLength(length_sym, br); const int length = GetCopyLength(length_sym, br);
const int dist_symbol = ReadSymbol(&htree_group->htrees_[DIST], br); const int dist_symbol = ReadSymbol(&htree_group->htrees_[DIST], br);
// TODO(urvang): Evaluate if we should check 'dist_symbol', 'dist_code'
// and/or 'dist' to be valid.
VP8LFillBitWindow(br); VP8LFillBitWindow(br);
dist_code = GetCopyDistance(dist_symbol, br); dist_code = GetCopyDistance(dist_symbol, br);
dist = PlaneCodeToDistance(width, dist_code); dist = PlaneCodeToDistance(width, dist_code);
if (src - data < dist || src_end - src < length) { if (src - data < dist || src_end - src < length) {
ok = 0; ok = 0;
goto Error; goto End;
} }
{ {
int i; int i;
@ -636,16 +634,16 @@ static int DecodeImageData(VP8LDecoder* const dec,
goto AdvanceByOne; goto AdvanceByOne;
} else { // Not reached. } else { // Not reached.
ok = 0; ok = 0;
goto Error; goto End;
} }
ok = !br->error_; ok = !br->error_;
if (!ok) goto Error; if (!ok) goto End;
} }
// Process the remaining rows corresponding to last row-block. // Process the remaining rows corresponding to last row-block.
if (process_row) ProcessRows(dec, row); if (process_row) ProcessRows(dec, row);
Error: End:
if (br->error_ || !ok) { if (br->error_ || !ok || (br->eos_ && src < src_end)) {
ok = 0; ok = 0;
dec->status_ = (!br->eos_) ? dec->status_ = (!br->eos_) ?
VP8_STATUS_BITSTREAM_ERROR : VP8_STATUS_SUSPENDED; VP8_STATUS_BITSTREAM_ERROR : VP8_STATUS_SUSPENDED;