Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

* tools/tiffcrop.c: fix readContigStripsIntoBuffer() in -i (ignore) m…

…ode 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
  • Loading branch information...
erouault
erouault committed Dec 3, 2016
1 parent 43bc256 commit 9657bbe3cdce4aaa90e07d50c1c70ae52da0ba6a
Showing with 8 additions and 1 deletion.
  1. +7 −0 ChangeLog
  2. +1 −1 tools/tiffcrop.c
@@ -1,3 +1,10 @@
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

2016-12-03 Even Rouault <even.rouault at spatialys.com>

* libtiff/tif_ojpeg.c: make OJPEGDecode() early exit in case of failure in
@@ -3698,7 +3698,7 @@ static int readContigStripsIntoBuffer (TIFF* in, uint8* buf)
(unsigned long) strip, (unsigned long)rows);
return 0;
}
bufp += bytes_read;
bufp += stripsize;
}

return 1;

0 comments on commit 9657bbe

Please sign in to comment.
You can’t perform that action at this time.