diff --git a/media/libwebp/moz.yaml b/media/libwebp/moz.yaml --- a/media/libwebp/moz.yaml +++ b/media/libwebp/moz.yaml @@ -9,11 +9,11 @@ description: "WebP codec library" url: "https://chromium.googlesource.com/webm/libwebp" license: BSD-3-Clause - release: v1.3.2 (2023-09-13T22:11:07Z). + release: v1.3.2 (2023-09-13T15:11:07-07:00). revision: "v1.3.0" license-file: COPYING diff --git a/media/libwebp/src/dec/vp8l_dec.c b/media/libwebp/src/dec/vp8l_dec.c --- a/media/libwebp/src/dec/vp8l_dec.c +++ b/media/libwebp/src/dec/vp8l_dec.c @@ -1239,24 +1239,13 @@ goto Error; } } br->eos_ = VP8LIsEndOfStream(br); - // In incremental decoding: - // br->eos_ && src < src_last: if 'br' reached the end of the buffer and - // 'src_last' has not been reached yet, there is not enough data. 'dec' has to - // be reset until there is more data. - // !br->eos_ && src < src_last: this cannot happen as either the buffer is - // fully read, either enough has been read to reach 'src_last'. - // src >= src_last: 'src_last' is reached, all is fine. 'src' can actually go - // beyond 'src_last' in case the image is cropped and an LZ77 goes further. - // The buffer might have been enough or there is some left. 'br->eos_' does - // not matter. - assert(!dec->incremental_ || (br->eos_ && src < src_last) || src >= src_last); - if (dec->incremental_ && br->eos_ && src < src_last) { + if (dec->incremental_ && br->eos_ && src < src_end) { RestoreState(dec); - } else if ((dec->incremental_ && src >= src_last) || !br->eos_) { + } else if (!br->eos_) { // Process the remaining rows corresponding to last row-block. if (process_func != NULL) { process_func(dec, row > last_row ? last_row : row); } dec->status_ = VP8_STATUS_OK;