43 lines
1.6 KiB
Diff
43 lines
1.6 KiB
Diff
Fix CVE-2016-10092:
|
|
|
|
http://bugzilla.maptools.org/show_bug.cgi?id=2620
|
|
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-10092
|
|
https://security-tracker.debian.org/tracker/CVE-2016-10092
|
|
|
|
2016-12-03 Even Rouault <even.rouault at spatialys.com>
|
|
|
|
* tools/tiffcrop.c: fix readContigStripsIntoBuffer() in -i (ignore)
|
|
mode so that the output buffer is correctly incremented to avoid write
|
|
outside bounds.
|
|
Reported by Agostino Sarubbo.
|
|
Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2620
|
|
|
|
/cvs/maptools/cvsroot/libtiff/ChangeLog,v <-- ChangeLog
|
|
new revision: 1.1178; previous revision: 1.1177
|
|
/cvs/maptools/cvsroot/libtiff/tools/tiffcrop.c,v <-- tools/tiffcrop.c
|
|
new revision: 1.47; previous revision: 1.46
|
|
|
|
Index: libtiff/tools/tiffcrop.c
|
|
===================================================================
|
|
RCS file: /cvs/maptools/cvsroot/libtiff/tools/tiffcrop.c,v
|
|
retrieving revision 1.46
|
|
retrieving revision 1.47
|
|
diff -u -r1.46 -r1.47
|
|
--- libtiff/tools/tiffcrop.c 18 Nov 2016 14:58:46 -0000 1.46
|
|
+++ libtiff/tools/tiffcrop.c 3 Dec 2016 11:35:56 -0000 1.47
|
|
@@ -1,4 +1,4 @@
|
|
-/* $Id: tiffcrop.c,v 1.46 2016-11-18 14:58:46 erouault Exp $ */
|
|
+/* $Id: tiffcrop.c,v 1.47 2016-12-03 11:35:56 erouault Exp $ */
|
|
|
|
/* tiffcrop.c -- a port of tiffcp.c extended to include manipulations of
|
|
* the image data through additional options listed below
|
|
@@ -3698,7 +3698,7 @@
|
|
(unsigned long) strip, (unsigned long)rows);
|
|
return 0;
|
|
}
|
|
- bufp += bytes_read;
|
|
+ bufp += stripsize;
|
|
}
|
|
|
|
return 1;
|