| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172 |
- From 237c9c18b0b3479950e54a755ae428bf0f55f754 Mon Sep 17 00:00:00 2001
- From: erouault <erouault>
- Date: Sun, 27 Dec 2015 16:55:20 +0000
- Subject: [PATCH] * libtiff/tif_next.c: fix potential out-of-bound write in
- NeXTDecode() triggered by http://lcamtuf.coredump.cx/afl/vulns/libtiff5.tif
- (bugzilla #2508)
- ---
- ChangeLog | 6 ++++++
- libtiff/tif_next.c | 12 +++++++++---
- 2 files changed, 15 insertions(+), 3 deletions(-)
- diff --git a/ChangeLog b/ChangeLog
- index b8aa23c..04926a3 100644
- --- a/ChangeLog
- +++ b/ChangeLog
- @@ -1,5 +1,11 @@
- 2015-12-27 Even Rouault <even.rouault at spatialys.com>
-
- + * libtiff/tif_next.c: fix potential out-of-bound write in NeXTDecode()
- + triggered by http://lcamtuf.coredump.cx/afl/vulns/libtiff5.tif
- + (bugzilla #2508)
- +
- +2015-12-27 Even Rouault <even.rouault at spatialys.com>
- +
- * libtiff/tif_luv.c: fix potential out-of-bound writes in decode
- functions in non debug builds by replacing assert()s by regular if
- checks (bugzilla #2522).
- diff --git a/libtiff/tif_next.c b/libtiff/tif_next.c
- index 17e0311..1248caa 100644
- --- a/libtiff/tif_next.c
- +++ b/libtiff/tif_next.c
- @@ -1,4 +1,4 @@
- -/* $Id: tif_next.c,v 1.16 2014-12-29 12:09:11 erouault Exp $ */
- +/* $Id: tif_next.c,v 1.17 2015-12-27 16:55:20 erouault Exp $ */
-
- /*
- * Copyright (c) 1988-1997 Sam Leffler
- @@ -37,7 +37,7 @@
- case 0: op[0] = (unsigned char) ((v) << 6); break; \
- case 1: op[0] |= (v) << 4; break; \
- case 2: op[0] |= (v) << 2; break; \
- - case 3: *op++ |= (v); break; \
- + case 3: *op++ |= (v); op_offset++; break; \
- } \
- }
-
- @@ -106,6 +106,7 @@ NeXTDecode(TIFF* tif, uint8* buf, tmsize_t occ, uint16 s)
- uint32 imagewidth = tif->tif_dir.td_imagewidth;
- if( isTiled(tif) )
- imagewidth = tif->tif_dir.td_tilewidth;
- + tmsize_t op_offset = 0;
-
- /*
- * The scanline is composed of a sequence of constant
- @@ -122,10 +123,15 @@ NeXTDecode(TIFF* tif, uint8* buf, tmsize_t occ, uint16 s)
- * bounds, potentially resulting in a security
- * issue.
- */
- - while (n-- > 0 && npixels < imagewidth)
- + while (n-- > 0 && npixels < imagewidth && op_offset < scanline)
- SETPIXEL(op, grey);
- if (npixels >= imagewidth)
- break;
- + if (op_offset >= scanline ) {
- + TIFFErrorExt(tif->tif_clientdata, module, "Invalid data for scanline %ld",
- + (long) tif->tif_row);
- + return (0);
- + }
- if (cc == 0)
- goto bad;
- n = *bp++, cc--;
|
