diff options
| author | Nicolas Pena <npm@chromium.org> | 2017-07-28 13:23:59 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-07-28 18:39:37 +0000 |
| commit | d3c6f8119a4c6cd143c6f2f3f874705f57afaf36 (patch) | |
| tree | 8672cae6a59eb845827bce3532ededd26fc8a55b /third_party/libtiff/tif_getimage.c | |
| parent | 90555e06b0c03777bca17ca423b765b3cb517f56 (diff) | |
| download | pdfium-d3c6f8119a4c6cd143c6f2f3f874705f57afaf36.tar.xz | |
LibTIFF: upstream patch to fix null dereference
This CL applies this patch that fixes a recent null dereference regression:
https://github.com/vadz/libtiff/commit/57f4b28c00d78bd5d74768585d0e46b2e12e94f7
Bug: chromium:743621
Change-Id: I0f9d4321dc6ea71dd31cf0ba8420cc25d401f0d8
Reviewed-on: https://pdfium-review.googlesource.com/9490
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Nicolás Peña <npm@chromium.org>
Diffstat (limited to 'third_party/libtiff/tif_getimage.c')
| -rw-r--r-- | third_party/libtiff/tif_getimage.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/third_party/libtiff/tif_getimage.c b/third_party/libtiff/tif_getimage.c index 03c9a81fb6..d37f729c46 100644 --- a/third_party/libtiff/tif_getimage.c +++ b/third_party/libtiff/tif_getimage.c @@ -681,7 +681,7 @@ gtTileContig(TIFFRGBAImage* img, uint32* raster, uint32 w, uint32 h) return (0); } leftmost_toskew = safeskew; - for (row = 0; row < h; row += nrow) + for (row = 0; ret != 0 && row < h; row += nrow) { rowstoread = th - (row + img->row_offset) % th; nrow = (row + rowstoread > h ? h - row : rowstoread); @@ -830,7 +830,7 @@ gtTileSeparate(TIFFRGBAImage* img, uint32* raster, uint32 w, uint32 h) leftmost_fromskew = img->col_offset % tw; leftmost_tw = tw - leftmost_fromskew; leftmost_toskew = toskew + leftmost_fromskew; - for (row = 0; row < h; row += nrow) + for (row = 0; ret != 0 && row < h; row += nrow) { rowstoread = th - (row + img->row_offset) % th; nrow = (row + rowstoread > h ? h - row : rowstoread); |