modify libtiff.spec

This commit is contained in:
dongyuzhen 2022-04-02 15:29:47 +08:00
parent 94ee84cbab
commit 143c1c65c9
2 changed files with 56 additions and 11 deletions

View File

@ -0,0 +1,34 @@
From 42f499986d3c8a1dce55db7d97d501f8e9dfc8f6 Mon Sep 17 00:00:00 2001
From: t.feng <fengtao40@huawei.com>
Date: Mon, 13 Dec 2021 21:03:13 +0800
Subject: [PATCH] fix raw2tiff floating point exception
if we input illegal nbands, like:
raw2tiff -b :2 test.raw test.tif
we got:
Floating point exception (core dumped)
so, check nbands before guessSize
---
tools/raw2tiff.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/tools/raw2tiff.c b/tools/raw2tiff.c
index dfee715..3a6f00e 100644
--- a/tools/raw2tiff.c
+++ b/tools/raw2tiff.c
@@ -209,6 +209,11 @@ main(int argc, char* argv[])
return (EXIT_FAILURE);
}
+ if (nbands == 0) {
+ fprintf(stderr, "The number of bands is illegal.\n");
+ return (-1);
+ }
+
if (guessSize(fd, dtype, hdr_size, nbands, swab, &width, &length) < 0)
return EXIT_FAILURE;
--
2.27.0

View File

@ -1,6 +1,6 @@
Name: libtiff
Version: 4.3.0
Release: 9
Release: 12
Summary: TIFF Library and Utilities
License: libtiff
URL: https://www.simplesystems.org/libtiff/
@ -18,6 +18,8 @@ Patch6008: backport-CVE-2022-0865.patch
Patch6009: backport-CVE-2022-0909.patch
Patch6010: backport-CVE-2022-0924.patch
Patch9000: fix-raw2tiff-floating-point-exception.patch
BuildRequires: gcc gcc-c++ zlib-devel libjpeg-devel jbigkit-devel
BuildRequires: libtool automake autoconf pkgconfig
@ -137,41 +139,50 @@ find html -name 'Makefile*' | xargs rm
%exclude %{_datadir}/html/man/tiffgt.1.html
%changelog
* Fri Apr 01 2022 dongyuzhen <dongyuzhen@h-partners.com> - 4.3.0-9
* Fri Apr 01 2022 dongyuzhen <dongyuzhen@h-partners.com> - 4.3.0-12
- fix CVE-2022-0909,CVE-2022-0924
* Tue Mar 29 2022 yangcheng <yangcheng87@h-partners.com> - 4.3.0-8
* Tue Mar 29 2022 yangcheng <yangcheng87@h-partners.com> - 4.3.0-11
- fix CVE-2022-0865
* Mon Mar 28 2022 yangcheng <yangcheng87@h-partners.com> - 4.3.0-7
* Mon Mar 28 2022 yangcheng <yangcheng87@h-partners.com> - 4.3.0-10
- fix CVE-2022-0907
* Tue Mar 22 2022 yangcheng <yangcheng87@h-partners.com> - 4.3.0-6
* Tue Mar 22 2022 yangcheng <yangcheng87@h-partners.com> - 4.3.0-9
- Type:cve
- ID:CVE-2022-0908
- SUG:NA
- DESC:fix CVE-2022-0908
* Thu Mar 17 2022 wangkerong <wangkerong@h-partners.com> - 4.3.0-5
* Thu Mar 17 2022 wangkerong <wangkerong@h-partners.com> - 4.3.0-8
- Type:cve
- ID:CVE-2022-0891
- SUG:NA
- DESC:fix CVE-2022-0891
* Tue Mar 08 2022 dongyuzhen <dongyuzhen@h-partners.com> - 4.3.0-4
* Tue Mar 08 2022 dongyuzhen <dongyuzhen@h-partners.com> - 4.3.0-7
- Type:cves
- ID:CVE-2022-22844
- SUG:NA
- DESC:fix CVE-2022-22844
* Wed Feb 23 2022 liuyumeng <liuyumeng5@h-partners.com> -4.3.0-3
* Wed Feb 23 2022 liuyumeng <liuyumeng5@h-partners.com> - 4.3.0-6
- Type:cves
- ID:CVE-2022-0561CVE-2022-0562
- ID:CVE-2022-0561 CVE-2022-0562
- SUG:NA
- DESC:fix CVE-2022-0561 CVE-2022-0562
* Mon Dec 13 2021 liuyumeng <liuyumeng5@huawei.com> - 4.3.0-2
- fix incorrect writing when unpacking
* Fri Dec 24 2021 liuyumeng <liuyumeng5@huawei.com> - 4.3.0-5
- fix the dependency package connot find TIFF_SSIZE_T in tiffio.h
* Wed Dec 15 2021 liuyumeng <liuyumeng5@huawei.com> - 4.3.0-4
- fix raw2tiff floating point exception
* Mon Dec 13 2021 liuyumeng <liuyumeng5@huawei.com> - 4.3.0-3
- fix incorrect writing when unpacking in spec
* Mon Dec 06 2021 liuyumeng <liuyumeng5@huawei.com> - 4.3.0-2
- fix the date in the changelog
* Fri Dec 03 2021 liuyumeng <liuyumeng5@huawei.com> - 4.3.0-1
- update to libtiff-4.3.0-1