cheng/libtiff
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix TIFF_VARIABLE/TIFF_VARIABLE2 confusion in TIFFPrintDirectory.

Browse Source
This commit is contained in:
Tom Lane 2012-12-12 22:50:18 +00:00
parent 800527edd2
commit f752daaaab
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2012-12-12 Tom Lane <tgl@sss.pgh.pa.us>
* libtiff/tif_print.c: Fix TIFFPrintDirectory's handling of
field_passcount fields: it had the TIFF_VARIABLE and
TIFF_VARIABLE2 cases backwards.
2012-12-10 Tom Lane <tgl@sss.pgh.pa.us> 2012-12-10 Tom Lane <tgl@sss.pgh.pa.us>
* tools/ppm2tiff.c: Improve previous patch for CVE-2012-4564: * tools/ppm2tiff.c: Improve previous patch for CVE-2012-4564:

6
libtiff/tif_print.c
View File

@ -1,4 +1,4 @@
/* $Id: tif_print.c,v 1.60 2012-08-19 16:56:35 bfriesen Exp $ */ /* $Id: tif_print.c,v 1.61 2012-12-12 22:50:18 tgl Exp $ */
/* /*
* Copyright (c) 1988-1997 Sam Leffler * Copyright (c) 1988-1997 Sam Leffler
@ -582,10 +582,10 @@ TIFFPrintDirectory(TIFF* tif, FILE* fd, long flags)
continue; continue;
if(fip->field_passcount) { if(fip->field_passcount) {
if (fip->field_readcount == TIFF_VARIABLE ) { if (fip->field_readcount == TIFF_VARIABLE2 ) {
if(TIFFGetField(tif, tag, &value_count, &raw_data) != 1) if(TIFFGetField(tif, tag, &value_count, &raw_data) != 1)
continue; continue;
} else if (fip->field_readcount == TIFF_VARIABLE2 ) { } else if (fip->field_readcount == TIFF_VARIABLE ) {
uint16 small_value_count; uint16 small_value_count;
if(TIFFGetField(tif, tag, &small_value_count, &raw_data) != 1) if(TIFFGetField(tif, tag, &small_value_count, &raw_data) != 1)
continue; continue;