dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2024-11-20 04:18:26 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge "Fix a crash in lossless decoder."

Browse Source
This commit is contained in:
pascal massimino 2012-05-09 02:21:13 -07:00 committed by Gerrit Code Review
commit cb1bd741f9
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/dec/vp8l.c
View File

@ -301,7 +301,6 @@ static void DeleteHtreeGroups(HTreeGroup* htree_groups, int num_htree_groups) {
static int ReadHuffmanCodes(VP8LDecoder* const dec, int xsize, int ysize, static int ReadHuffmanCodes(VP8LDecoder* const dec, int xsize, int ysize,
int color_cache_bits) { int color_cache_bits) {
int ok = 0;
int i, j; int i, j;
VP8LBitReader* const br = &dec->br_; VP8LBitReader* const br = &dec->br_;
VP8LMetadata* const hdr = &dec->hdr_; VP8LMetadata* const hdr = &dec->hdr_;
@ -331,31 +330,30 @@ static int ReadHuffmanCodes(VP8LDecoder* const dec, int xsize, int ysize,
} }
} }
if (br->error_) goto Error;
htree_groups = (HTreeGroup*)calloc(num_htree_groups, sizeof(*htree_groups)); htree_groups = (HTreeGroup*)calloc(num_htree_groups, sizeof(*htree_groups));
if (htree_groups == NULL) { if (htree_groups == NULL) {
dec->status_ = VP8_STATUS_OUT_OF_MEMORY; dec->status_ = VP8_STATUS_OUT_OF_MEMORY;
goto Error; goto Error;
} }
ok = !br->error_; for (i = 0; i < num_htree_groups; ++i) {
for (i = 0; ok && i < num_htree_groups; ++i) {
HuffmanTree* const htrees = htree_groups[i].htrees_; HuffmanTree* const htrees = htree_groups[i].htrees_;
for (j = 0; j < HUFFMAN_CODES_PER_META_CODE; ++j) { for (j = 0; j < HUFFMAN_CODES_PER_META_CODE; ++j) {
int alphabet_size = kAlphabetSize[j]; int alphabet_size = kAlphabetSize[j];
if (j == 0 && color_cache_bits > 0) { if (j == 0 && color_cache_bits > 0) {
alphabet_size += 1 << color_cache_bits; alphabet_size += 1 << color_cache_bits;
} }
ok = ReadHuffmanCode(alphabet_size, dec, htrees + j); if (!ReadHuffmanCode(alphabet_size, dec, htrees + j)) goto Error;
ok = ok && !br->error_;
} }
} }
if (ok) { // finalize pointers and return // All OK. Finalize pointers and return.
hdr->huffman_image_ = huffman_image; hdr->huffman_image_ = huffman_image;
hdr->num_htree_groups_ = num_htree_groups; hdr->num_htree_groups_ = num_htree_groups;
hdr->htree_groups_ = htree_groups; hdr->htree_groups_ = htree_groups;
return ok; return 1;
}
Error: Error:
free(huffman_image); free(huffman_image);