diff options
| author | Nicolas Pena <npm@chromium.org> | 2017-07-13 10:36:06 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-07-13 15:17:26 +0000 |
| commit | c3eca649ce2213b06551e8de8793e24ec6f9cef5 (patch) | |
| tree | 2b3f8d5a74c79b47ea3f573412419889f779ce82 /third_party/libtiff/tiffiop.h | |
| parent | ebc351b1aa10582f8486573e65157adf5dadd8cd (diff) | |
| download | pdfium-c3eca649ce2213b06551e8de8793e24ec6f9cef5.tar.xz | |
Libtiff OOM upstream patch
This CL applies two upstream patches that help with OOM problems:
https://github.com/vadz/libtiff/commit/1077fad562e03d1cad591dd10163dd80ad63ab0e
https://github.com/vadz/libtiff/commit/0a619f1e553e46df8022b889ff44f8a1faa1e48d
These do not yet fix the bug below.
Bug: chromium:718494
Change-Id: If68c20f504b27c07dba2765f8e5ef708c1a54d7e
Reviewed-on: https://pdfium-review.googlesource.com/7731
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: Nicolás Peña <npm@chromium.org>
Diffstat (limited to 'third_party/libtiff/tiffiop.h')
| -rw-r--r-- | third_party/libtiff/tiffiop.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/third_party/libtiff/tiffiop.h b/third_party/libtiff/tiffiop.h index 1925a6b5e4..c42ebef436 100644 --- a/third_party/libtiff/tiffiop.h +++ b/third_party/libtiff/tiffiop.h @@ -364,6 +364,20 @@ extern void* _TIFFCheckRealloc(TIFF*, void*, tmsize_t, tmsize_t, const char*); extern double _TIFFUInt64ToDouble(uint64); extern float _TIFFUInt64ToFloat(uint64); +extern tmsize_t +_TIFFReadEncodedStripAndAllocBuffer(TIFF* tif, uint32 strip, + void **buf, tmsize_t bufsizetoalloc, + tmsize_t size_to_read); + +extern tmsize_t +_TIFFReadEncodedTileAndAllocBuffer(TIFF* tif, uint32 tile, + void **buf, tmsize_t bufsizetoalloc, + tmsize_t size_to_read); +extern tmsize_t +_TIFFReadTileAndAllocBuffer(TIFF* tif, + void **buf, tmsize_t bufsizetoalloc, + uint32 x, uint32 y, uint32 z, uint16 s); + extern int TIFFInitDumpMode(TIFF*, int); #ifdef PACKBITS_SUPPORT extern int TIFFInitPackBits(TIFF*, int); |