dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2025-10-30 18:05:36 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge "VP8BitReaderSetBuffer: move NULL check to call site" into main

Browse Source
This commit is contained in:
James Zern
2025-06-24 12:45:57 -07:00
committed by Gerrit Code Review
parent f6b87e03fc bbf3cbb1be
commit 23ce76fa37
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/dec/idec_dec.c
View File

@@ -141,8 +141,14 @@ static void DoRemap(WebPIDecoder* const idec, ptrdiff_t offset) {
} }
{ {
const uint8_t* const last_start = dec->parts[last_part].buf; const uint8_t* const last_start = dec->parts[last_part].buf;
VP8BitReaderSetBuffer(&dec->parts[last_part], last_start, // 'last_start' will be NULL when 'idec->state' is < STATE_VP8_PARTS0
mem->buf + mem->end - last_start); // and through a portion of that state (when there isn't enough data to
// parse the partitions). The bitreader is only used meaningfully when
// there is enough data to begin parsing partition 0.
if (last_start != NULL) {
VP8BitReaderSetBuffer(&dec->parts[last_part], last_start,
mem->buf + mem->end - last_start);
}
} }
if (NeedCompressedAlpha(idec)) { if (NeedCompressedAlpha(idec)) {
ALPHDecoder* const alph_dec = dec->alph_dec; ALPHDecoder* const alph_dec = dec->alph_dec;

11
src/utils/bit_reader_utils.c
View File

@@ -31,12 +31,11 @@
void VP8BitReaderSetBuffer(VP8BitReader* const br, void VP8BitReaderSetBuffer(VP8BitReader* const br,
const uint8_t* const start, const uint8_t* const start,
size_t size) { size_t size) {
if (start != NULL) { assert(start != NULL);
br->buf = start; br->buf = start;
br->buf_end = start + size; br->buf_end = start + size;
br->buf_max = br->buf_max =
(size >= sizeof(lbit_t)) ? start + size - sizeof(lbit_t) + 1 : start; (size >= sizeof(lbit_t)) ? start + size - sizeof(lbit_t) + 1 : start;
}
} }
void VP8InitBitReader(VP8BitReader* const br, void VP8InitBitReader(VP8BitReader* const br,