|
| 1 | +From f42a3998f5dba33e187097367079f8ec920a20d5 Mon Sep 17 00:00:00 2001 |
| 2 | +From: Lee Howard <faxguy@howardsilvan.com> |
| 3 | +Date: Fri, 5 Sep 2025 11:48:00 -0700 |
| 4 | +Subject: [PATCH 1/2] avoid out-of-bounds read identified in #733 |
| 5 | + |
| 6 | +--- |
| 7 | + archive/tools/tiffdither.c | 5 +++++ |
| 8 | + 1 file changed, 5 insertions(+) |
| 9 | + |
| 10 | +diff --git a/archive/tools/tiffdither.c b/archive/tools/tiffdither.c |
| 11 | +index 0c86e7f..17673e7 100644 |
| 12 | +--- a/archive/tools/tiffdither.c |
| 13 | ++++ b/archive/tools/tiffdither.c |
| 14 | +@@ -87,6 +87,11 @@ static int fsdither(TIFF *in, TIFF *out) |
| 15 | + fprintf(stderr, "Out of memory.\n"); |
| 16 | + goto skip_on_error; |
| 17 | + } |
| 18 | ++ if (imagewidth > TIFFScanlineSize(in)) |
| 19 | ++ { |
| 20 | ++ fprintf(stderr, "Image width exceeds scanline size.\n"); |
| 21 | ++ goto skip_on_error; |
| 22 | ++ } |
| 23 | + |
| 24 | + /* |
| 25 | + * Get first line |
| 26 | +-- |
| 27 | +2.45.4 |
| 28 | + |
| 29 | + |
| 30 | +From c88c56e1ad690bd55a3a2a18a9c68ab49059b11a Mon Sep 17 00:00:00 2001 |
| 31 | +From: Lee Howard <faxguy@howardsilvan.com> |
| 32 | +Date: Fri, 5 Sep 2025 12:11:13 -0700 |
| 33 | +Subject: [PATCH 2/2] avoid null pointer dereference in tiffcrop #734 |
| 34 | + |
| 35 | +Signed-off-by: Azure Linux Security Servicing Account <azurelinux-security@microsoft.com> |
| 36 | +Upstream-reference: https://gitlab.com/libtiff/libtiff/-/merge_requests/755.patch |
| 37 | +--- |
| 38 | + archive/tools/tiffcrop.c | 2 +- |
| 39 | + 1 file changed, 1 insertion(+), 1 deletion(-) |
| 40 | + |
| 41 | +diff --git a/archive/tools/tiffcrop.c b/archive/tools/tiffcrop.c |
| 42 | +index adfd0d2..f69efa8 100644 |
| 43 | +--- a/archive/tools/tiffcrop.c |
| 44 | ++++ b/archive/tools/tiffcrop.c |
| 45 | +@@ -2925,7 +2925,7 @@ int main(int argc, char *argv[]) |
| 46 | + if (dump.outfile != NULL) |
| 47 | + { |
| 48 | + dump_info(dump.outfile, dump.format, "", "Completed run for %s", |
| 49 | +- TIFFFileName(out)); |
| 50 | ++ out ? TIFFFileName(out) : "(not opened)"); |
| 51 | + fclose(dump.outfile); |
| 52 | + } |
| 53 | + } |
| 54 | +-- |
| 55 | +2.45.4 |
| 56 | + |
0 commit comments