dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2024-12-26 13:48:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge "add a malloc() check" into 0.2.0

Browse Source
This commit is contained in:
James Zern 2012-07-16 19:18:28 -07:00 committed by Gerrit Code Review
commit ab2da3e9fd
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/dec/vp8l.c
View File

@ -890,12 +890,22 @@ static int DecodeImageStream(int xsize, int ysize,
goto End; goto End;
} }
data = (uint32_t*)malloc(transform_xsize * transform_ysize * sizeof(*data)); {
const uint64_t total_size =
transform_xsize * transform_ysize * sizeof(*data);
if (total_size != (size_t)total_size) {
// This shouldn't happen, because of transform_bits limit, but...
dec->status_ = VP8_STATUS_BITSTREAM_ERROR;
ok = 0;
goto End;
}
data = (uint32_t*)malloc((size_t)total_size);
if (data == NULL) { if (data == NULL) {
dec->status_ = VP8_STATUS_OUT_OF_MEMORY; dec->status_ = VP8_STATUS_OUT_OF_MEMORY;
ok = 0; ok = 0;
goto End; goto End;
} }
}
// Use the Huffman trees to decode the LZ77 encoded data. // Use the Huffman trees to decode the LZ77 encoded data.
ok = DecodeImageData(dec, data, transform_xsize, transform_ysize, NULL); ok = DecodeImageData(dec, data, transform_xsize, transform_ysize, NULL);