|
| 1 | +From 181b242df620a164fa9ee669c6f77bd53661130f Mon Sep 17 00:00:00 2001 |
| 2 | + |
| 3 | +Date: Sat, 2 Aug 2025 18:55:54 +0200 |
| 4 | +Subject: [PATCH] tiff2ps: check return of TIFFGetFiled() for |
| 5 | + TIFFTAG_STRIPBYTECOUNTS and TIFFTAG_TILEBYTECOUNTS to avoid NULL pointer |
| 6 | + dereference. |
| 7 | + |
| 8 | +Closes #718 |
| 9 | +--- |
| 10 | + tools/unsupported/tiff2ps.c | 20 +++++++++++++++++--- |
| 11 | + 1 file changed, 17 insertions(+), 3 deletions(-) |
| 12 | + |
| 13 | +diff --git a/tools/unsupported/tiff2ps.c b/tools/unsupported/tiff2ps.c |
| 14 | +index 541495d..d6a54b4 100644 |
| 15 | +--- a/tools/unsupported/tiff2ps.c |
| 16 | ++++ b/tools/unsupported/tiff2ps.c |
| 17 | +@@ -2432,12 +2432,22 @@ int PS_Lvl2page(FILE *fd, TIFF *tif, uint32_t w, uint32_t h) |
| 18 | + if (tiled_image) |
| 19 | + { |
| 20 | + num_chunks = TIFFNumberOfTiles(tif); |
| 21 | +- TIFFGetField(tif, TIFFTAG_TILEBYTECOUNTS, &bc); |
| 22 | ++ if (!TIFFGetField(tif, TIFFTAG_TILEBYTECOUNTS, &bc)) |
| 23 | ++ { |
| 24 | ++ TIFFError(filename, |
| 25 | ++ "Can't read bytecounts of tiles at PS_Lvl2page()"); |
| 26 | ++ return (FALSE); |
| 27 | ++ } |
| 28 | + } |
| 29 | + else |
| 30 | + { |
| 31 | + num_chunks = TIFFNumberOfStrips(tif); |
| 32 | +- TIFFGetField(tif, TIFFTAG_STRIPBYTECOUNTS, &bc); |
| 33 | ++ if (!TIFFGetField(tif, TIFFTAG_STRIPBYTECOUNTS, &bc)) |
| 34 | ++ { |
| 35 | ++ TIFFError(filename, |
| 36 | ++ "Can't read bytecounts of strips at PS_Lvl2page()"); |
| 37 | ++ return (FALSE); |
| 38 | ++ } |
| 39 | + } |
| 40 | + |
| 41 | + if (use_rawdata) |
| 42 | +@@ -3107,7 +3117,11 @@ void PSRawDataBW(FILE *fd, TIFF *tif, uint32_t w, uint32_t h) |
| 43 | + (void)w; |
| 44 | + (void)h; |
| 45 | + TIFFGetFieldDefaulted(tif, TIFFTAG_FILLORDER, &fillorder); |
| 46 | +- TIFFGetField(tif, TIFFTAG_STRIPBYTECOUNTS, &bc); |
| 47 | ++ if (!TIFFGetField(tif, TIFFTAG_STRIPBYTECOUNTS, &bc)) |
| 48 | ++ { |
| 49 | ++ TIFFError(filename, "Can't read bytecounts of strips at PSRawDataBW()"); |
| 50 | ++ return; |
| 51 | ++ } |
| 52 | + |
| 53 | + /* |
| 54 | + * Find largest strip: |
| 55 | +-- |
| 56 | +2.45.4 |
| 57 | + |
0 commit comments