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 "GetHistoBits: fix integer overflow"

Browse Source
This commit is contained in:
pascal massimino 2012-10-03 14:51:22 -07:00 committed by Gerrit Code Review
commit 7fee5d1231
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/enc/vp8l.c
View File

@ -899,11 +899,11 @@ static int GetHistoBits(const WebPConfig* const config,
const WebPPicture* const pic) { const WebPPicture* const pic) {
const int width = pic->width; const int width = pic->width;
const int height = pic->height; const int height = pic->height;
const size_t hist_size = sizeof(VP8LHistogram); const uint64_t hist_size = sizeof(VP8LHistogram);
// Make tile size a function of encoding method (Range: 0 to 6). // Make tile size a function of encoding method (Range: 0 to 6).
int histo_bits = 7 - config->method; int histo_bits = 7 - config->method;
while (1) { while (1) {
const size_t huff_image_size = VP8LSubSampleSize(width, histo_bits) * const uint64_t huff_image_size = VP8LSubSampleSize(width, histo_bits) *
VP8LSubSampleSize(height, histo_bits) * VP8LSubSampleSize(height, histo_bits) *
hist_size; hist_size;
if (huff_image_size <= MAX_HUFF_IMAGE_SIZE) break; if (huff_image_size <= MAX_HUFF_IMAGE_SIZE) break;