mirror of
https://github.com/webmproject/libwebp.git
synced 2025-07-13 14:34:33 +02:00
Merge tag 'v0.5.2'
libwebp-0.5.2 - 12/13/2016: version 0.5.2 This is a binary compatible release. This release covers CVE-2016-8888 and CVE-2016-9085. * further security related hardening in the tools; fixes to gif2webp/AnimEncoder (issues #310, #314, #316, #322), cwebp/libwebp (issue #312) * full libwebp (encoder & decoder) iOS framework; libwebpdecoder WebP.framework renamed to WebPDecoder.framework (issue #307) * CMake support for Android Studio (2.2) * miscellaneous build related fixes (issue #306, #313) * miscellaneous documentation improvements (issue #225) * minor lossy encoder fixes and improvements * tag 'v0.5.2': (54 commits) update ChangeLog anim_util: quiet implicit conv warnings in 32-bit jpegdec: correct ContextFill signature Remove some errors when compiling the code as C++. vwebp: clear canvas during resize w/o animation tiffdec: restore libtiff 3.9.x compatibility update NEWS AnimEncoder: avoid freeing uninitialized memory pointer. WebPAnimEncoder: If 'minimize_size' and 'allow_mixed' on, try lossy + lossless. fix a potential overflow with MALLOC_LIMIT bump version to 0.5.2 update AUTHORS & .mailmap iosbuild.sh: add WebPDecoder.framework + encoder AnimEncoder: Correctly skip a frame when sub-rectangle is empty. Fix assertions in WebPRescalerExportRow() fix a typo in WebPPictureYUVAToARGB's doc systematically call WebPDemuxReleaseIterator() on dec->prev_iter_ doc: use two's complement explicitly for uint8->int8 conversion Anim_encoder: correctly handle enc->prev_candidate_undecided_ WebPPictureDistortion(): free() -> WebPSafeFree() ... Change-Id: I16bcf54af41ce8fad98d4fbc8aa1df58f338fc23
This commit is contained in:
@ -156,9 +156,9 @@ int ReadTIFF(const uint8_t* const data, size_t data_size,
|
||||
}
|
||||
// _Tiffmalloc uses a signed type for size.
|
||||
alloc_size = (int64_t)((uint64_t)width * height * sizeof(*raster));
|
||||
if (alloc_size < 0 || alloc_size != (tmsize_t)alloc_size) goto End;
|
||||
if (alloc_size < 0 || alloc_size != (tsize_t)alloc_size) goto End;
|
||||
|
||||
raster = (uint32*)_TIFFmalloc((tmsize_t)alloc_size);
|
||||
raster = (uint32*)_TIFFmalloc((tsize_t)alloc_size);
|
||||
if (raster != NULL) {
|
||||
if (TIFFReadRGBAImageOriented(tif, width, height, raster,
|
||||
ORIENTATION_TOPLEFT, 1)) {
|
||||
|
Reference in New Issue
Block a user