rpms/libtiff/FC-5 libtiff.spec, 1.37, 1.38 tiff-3.7.1-multiple.patch, 1.1, 1.2
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed May 3 18:51:28 UTC 2006
Author: mclasen
Update of /cvs/dist/rpms/libtiff/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv23578
Modified Files:
libtiff.spec tiff-3.7.1-multiple.patch
Log Message:
fix a segfault
Index: libtiff.spec
===================================================================
RCS file: /cvs/dist/rpms/libtiff/FC-5/libtiff.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- libtiff.spec 26 Apr 2006 18:23:22 -0000 1.37
+++ libtiff.spec 3 May 2006 18:51:23 -0000 1.38
@@ -1,7 +1,7 @@
Summary: Library of functions for manipulating TIFF format image files
Name: libtiff
Version: 3.7.4
-Release: 4
+Release: 5
License: distributable
Group: System Environment/Libraries
Source: ftp://ftp.remotesensing.org/pub/libtiff/tiff-%{version}.tar.gz
@@ -79,6 +79,9 @@
%{_mandir}/man3/*
%changelog
+* Wed May 3 2006 Matthias Clasen <mclasen at redhat.com> - 3.7.4-5
+- fix a problem with the previous patch (#190306)
+
* Wed Apr 26 2006 Matthias Clasen <mclasen at redhat.com> - 3.7.4-4
- fix several vulnerabilities (#189933, #189974, CVE-2006-2024)
tiff-3.7.1-multiple.patch:
tif_dirread.c | 9 ++++++++-
tif_fax3.c | 32 +++++++++++++++++++-------------
tif_jpeg.c | 26 +++++++++++++++-----------
tif_lzw.c | 2 ++
tif_pixarlog.c | 39 ++++++++++++++++++++++-----------------
tif_predict.c | 27 ++++++++++++++++++++++++++-
tif_predict.h | 1 +
tif_zip.c | 26 ++++++++++++++++----------
8 files changed, 109 insertions(+), 53 deletions(-)
Index: tiff-3.7.1-multiple.patch
===================================================================
RCS file: /cvs/dist/rpms/libtiff/FC-5/tiff-3.7.1-multiple.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tiff-3.7.1-multiple.patch 26 Apr 2006 18:23:22 -0000 1.1
+++ tiff-3.7.1-multiple.patch 3 May 2006 18:51:23 -0000 1.2
@@ -1,6 +1,6 @@
---- tiff-3.7.1/libtiff/tif_fax3.c.multiple 2004-12-20 14:29:27.000000000 -0500
-+++ tiff-3.7.1/libtiff/tif_fax3.c 2006-04-26 14:10:24.000000000 -0400
-@@ -1070,19 +1070,22 @@
+--- tiff-3.7.4/libtiff/tif_fax3.c.multiple 2005-07-29 09:21:10.000000000 -0400
++++ tiff-3.7.4/libtiff/tif_fax3.c 2006-05-03 14:34:30.000000000 -0400
+@@ -1056,19 +1056,22 @@
static void
Fax3Cleanup(TIFF* tif)
{
@@ -36,7 +36,7 @@
}
#define FIELD_BADFAXLINES (FIELD_CODEC+0)
-@@ -1131,6 +1134,9 @@
+@@ -1120,6 +1123,9 @@
{
Fax3BaseState* sp = Fax3State(tif);
@@ -46,9 +46,9 @@
switch (tag) {
case TIFFTAG_FAXMODE:
sp->mode = va_arg(ap, int);
---- tiff-3.7.1/libtiff/tif_dirread.c.multiple 2006-04-26 14:10:24.000000000 -0400
-+++ tiff-3.7.1/libtiff/tif_dirread.c 2006-04-26 14:10:24.000000000 -0400
-@@ -795,13 +795,20 @@
+--- tiff-3.7.4/libtiff/tif_dirread.c.multiple 2005-08-17 09:05:26.000000000 -0400
++++ tiff-3.7.4/libtiff/tif_dirread.c 2006-05-03 14:34:30.000000000 -0400
+@@ -784,13 +784,20 @@
int w = TIFFDataWidth((TIFFDataType) dir->tdir_type);
tsize_t cc = dir->tdir_count * w;
@@ -70,8 +70,8 @@
goto bad;
_TIFFmemcpy(cp, tif->tif_base + dir->tdir_offset, cc);
}
---- tiff-3.7.1/libtiff/tif_lzw.c.multiple 2004-10-02 09:52:29.000000000 -0400
-+++ tiff-3.7.1/libtiff/tif_lzw.c 2006-04-26 14:11:42.000000000 -0400
+--- tiff-3.7.4/libtiff/tif_lzw.c.multiple 2004-10-02 09:52:29.000000000 -0400
++++ tiff-3.7.4/libtiff/tif_lzw.c 2006-05-03 14:34:30.000000000 -0400
@@ -1002,6 +1002,8 @@
static void
LZWCleanup(TIFF* tif)
@@ -81,9 +81,9 @@
if (tif->tif_data) {
if (DecoderState(tif)->dec_codetab)
_TIFFfree(DecoderState(tif)->dec_codetab);
---- tiff-3.7.1/libtiff/tif_jpeg.c.multiple 2004-12-01 13:26:39.000000000 -0500
-+++ tiff-3.7.1/libtiff/tif_jpeg.c 2006-04-26 14:10:24.000000000 -0400
-@@ -1351,15 +1351,19 @@
+--- tiff-3.7.4/libtiff/tif_jpeg.c.multiple 2005-06-06 05:36:57.000000000 -0400
++++ tiff-3.7.4/libtiff/tif_jpeg.c 2006-05-03 14:35:04.000000000 -0400
+@@ -1500,15 +1500,19 @@
static void
JPEGCleanup(TIFF* tif)
{
@@ -112,8 +112,19 @@
}
static int
---- tiff-3.7.1/libtiff/tif_predict.c.multiple 2004-10-02 09:52:29.000000000 -0400
-+++ tiff-3.7.1/libtiff/tif_predict.c 2006-04-26 14:12:19.000000000 -0400
+@@ -1827,8 +1831,8 @@
+
+ assert(scheme == COMPRESSION_JPEG);
+
+- if ((tif->tif_flags & TIFF_CODERSETUP) == 0)
+- JPEGCleanup(tif);
++ if ((tif->tif_flags & TIFF_CODERSETUP) == 0 && tif->tif_data != NULL)
++ JPEGCleanup(tif);
+
+ /*
+ * Allocate state block so tag methods have storage to record values.
+--- tiff-3.7.4/libtiff/tif_predict.c.multiple 2005-06-06 05:36:59.000000000 -0400
++++ tiff-3.7.4/libtiff/tif_predict.c 2006-05-03 14:34:30.000000000 -0400
@@ -9,7 +9,7 @@
* that (i) the above copyright notices and this permission notice appear in
* all copies of the software and related documentation, and (ii) the names of
@@ -123,7 +134,7 @@
* permission of Sam Leffler and Silicon Graphics.
*
* THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
-@@ -386,6 +386,9 @@
+@@ -519,6 +519,9 @@
{
TIFFPredictorState *sp = PredictorState(tif);
@@ -133,7 +144,7 @@
switch (tag) {
case TIFFTAG_PREDICTOR:
sp->predictor = (uint16) va_arg(ap, int);
-@@ -403,6 +406,9 @@
+@@ -536,6 +539,9 @@
{
TIFFPredictorState *sp = PredictorState(tif);
@@ -143,7 +154,7 @@
switch (tag) {
case TIFFTAG_PREDICTOR:
*va_arg(ap, uint16*) = sp->predictor;
-@@ -436,6 +442,8 @@
+@@ -570,6 +576,8 @@
{
TIFFPredictorState* sp = PredictorState(tif);
@@ -152,8 +163,8 @@
/*
* Merge codec-specific tag information and
* override parent get/set field methods.
-@@ -461,4 +469,21 @@
- return (1);
+@@ -595,4 +603,21 @@
+ return 1;
}
+ int
@@ -174,8 +185,8 @@
+
+
/* vim: set ts=8 sts=8 sw=8 noet: */
---- tiff-3.7.1/libtiff/tif_zip.c.multiple 2004-10-02 09:52:29.000000000 -0400
-+++ tiff-3.7.1/libtiff/tif_zip.c 2006-04-26 14:10:24.000000000 -0400
+--- tiff-3.7.4/libtiff/tif_zip.c.multiple 2004-10-02 09:52:29.000000000 -0400
++++ tiff-3.7.4/libtiff/tif_zip.c 2006-05-03 14:34:30.000000000 -0400
@@ -249,17 +249,23 @@
ZIPCleanup(TIFF* tif)
{
@@ -210,9 +221,9 @@
}
static int
---- tiff-3.7.1/libtiff/tif_pixarlog.c.multiple 2004-10-14 13:53:27.000000000 -0400
-+++ tiff-3.7.1/libtiff/tif_pixarlog.c 2006-04-26 14:10:24.000000000 -0400
-@@ -1160,24 +1160,29 @@
+--- tiff-3.7.4/libtiff/tif_pixarlog.c.multiple 2005-01-15 12:20:58.000000000 -0500
++++ tiff-3.7.4/libtiff/tif_pixarlog.c 2006-05-03 14:34:30.000000000 -0400
+@@ -1163,24 +1163,29 @@
{
PixarLogState* sp = (PixarLogState*) tif->tif_data;
@@ -259,8 +270,8 @@
}
static int
---- tiff-3.7.1/libtiff/tif_predict.h.multiple 1999-07-27 17:50:27.000000000 -0400
-+++ tiff-3.7.1/libtiff/tif_predict.h 2006-04-26 14:10:24.000000000 -0400
+--- tiff-3.7.4/libtiff/tif_predict.h.multiple 2005-04-15 13:13:34.000000000 -0400
++++ tiff-3.7.4/libtiff/tif_predict.h 2006-05-03 14:34:30.000000000 -0400
@@ -55,6 +55,7 @@
extern "C" {
#endif
More information about the fedora-cvs-commits
mailing list