summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorerouault <erouault>2016-10-25 22:22:45 +0000
committererouault <erouault>2016-10-25 22:22:45 +0000
commit71c8604f01bdaa9824fa02e10d45e1da68fcd741 (patch)
treebef6d41f75e1b112ef4bef82020bf42a3f352b6b
parent78b576ecd94c371834b0b7d18ddee9e6bd1a5956 (diff)
downloadlibtiff-71c8604f01bdaa9824fa02e10d45e1da68fcd741.tar.gz
* tools/fax2tiff.c: fix segfault when specifying -r without
argument. Patch by Yuriy M. Kaminskiy. Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2572
-rw-r--r--ChangeLog6
-rw-r--r--tools/fax2tiff.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index bb244498..d33b4728 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-10-26 Even Rouault <even.rouault at spatialys.com>
+
+ * tools/fax2tiff.c: fix segfault when specifying -r without
+ argument. Patch by Yuriy M. Kaminskiy.
+ Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2572
+
2016-10-25 Even Rouault <even.rouault at spatialys.com>
* libtiff/tif_dir.c: discard values of SMinSampleValue and
diff --git a/tools/fax2tiff.c b/tools/fax2tiff.c
index 9bbcb63e..e00de527 100644
--- a/tools/fax2tiff.c
+++ b/tools/fax2tiff.c
@@ -1,4 +1,4 @@
-/* $Id: fax2tiff.c,v 1.24 2015-08-23 15:40:45 bfriesen Exp $ */
+/* $Id: fax2tiff.c,v 1.25 2016-10-25 22:22:45 erouault Exp $ */
/*
* Copyright (c) 1990-1997 Sam Leffler
@@ -116,7 +116,7 @@ main(int argc, char* argv[])
extern char* optarg;
#endif
- while ((c = getopt(argc, argv, "R:X:o:1234ABLMPUW5678abcflmprsuvwz?")) != -1)
+ while ((c = getopt(argc, argv, "R:X:o:r:1234ABLMPUW5678abcflmprsuvwz?")) != -1)
switch (c) {
/* input-related options */
case '3': /* input is g3-encoded */