You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
37 lines
1.3 KiB
37 lines
1.3 KiB
4 months ago
|
From 979173fc37955d27c9550beb6c7ed1f2466c6ff4 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Matej=20Mu=C5=BEila?= <mmuzila@redhat.com>
|
||
|
|
Date: Wed, 4 Oct 2023 13:13:08 +0200
|
||
|
|
Subject: [PATCH] (CVE-2023-3618) tiffcrop: fix 553 by considering error return
|
||
|
|
of writeSelections()
|
||
|
|
|
||
|
|
Closes #553
|
||
|
|
|
||
|
|
See merge request libtiff/libtiff!485
|
||
|
|
|
||
|
|
(cherry picked from commit 7ead6c42c70636c0ffec2e9ff3f16d614e37fb7b)
|
||
|
|
---
|
||
|
|
tools/tiffcrop.c | 10 ++++++++--
|
||
|
|
1 file changed, 8 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c
|
||
|
|
index be72ec52..edb33e25 100644
|
||
|
|
--- a/tools/tiffcrop.c
|
||
|
|
+++ b/tools/tiffcrop.c
|
||
|
|
@@ -2464,8 +2464,14 @@ main(int argc, char* argv[])
|
||
|
|
{ /* Whole image or sections not based on output page size */
|
||
|
|
if (crop.selections > 0)
|
||
|
|
{
|
||
|
|
- writeSelections(in, &out, &crop, &image, &dump, seg_buffs,
|
||
|
|
- mp, argv[argc - 1], &next_page, total_pages);
|
||
|
|
+ if (writeSelections(in, &out, &crop, &image, &dump,
|
||
|
|
+ seg_buffs, mp, argv[argc - 1],
|
||
|
|
+ &next_page, total_pages))
|
||
|
|
+ {
|
||
|
|
+ TIFFError("main",
|
||
|
|
+ "Unable to write new image selections");
|
||
|
|
+ exit(EXIT_FAILURE);
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
else /* One file all images and sections */
|
||
|
|
{
|