Skip to content
This repository was archived by the owner on Dec 1, 2017. It is now read-only.

Commit 9657bbe

Browse files
author
erouault
committed
* 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
1 parent 43bc256 commit 9657bbe

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

Diff for: ChangeLog

+7
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
2016-12-03 Even Rouault <even.rouault at spatialys.com>
2+
3+
* tools/tiffcrop.c: fix readContigStripsIntoBuffer() in -i (ignore) mode so
4+
that the output buffer is correctly incremented to avoid write outside bounds.
5+
Reported by Agostino Sarubbo.
6+
Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2620
7+
18
2016-12-03 Even Rouault <even.rouault at spatialys.com>
29

310
* libtiff/tif_ojpeg.c: make OJPEGDecode() early exit in case of failure in

Diff for: tools/tiffcrop.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -3698,7 +3698,7 @@ static int readContigStripsIntoBuffer (TIFF* in, uint8* buf)
36983698
(unsigned long) strip, (unsigned long)rows);
36993699
return 0;
37003700
}
3701-
bufp += bytes_read;
3701+
bufp += stripsize;
37023702
}
37033703

37043704
return 1;

0 commit comments

Comments
 (0)