!19 fix raw2tiff floating point exception
Merge pull request !19 from liuyumeng/openEuler-22.03-LTS-Next
This commit is contained in:
commit
b210513c1f
34
fix-raw2tiff-floating-point-exception.patch
Normal file
34
fix-raw2tiff-floating-point-exception.patch
Normal 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
|
||||||
|
|
||||||
@ -1,11 +1,13 @@
|
|||||||
Name: libtiff
|
Name: libtiff
|
||||||
Version: 4.3.0
|
Version: 4.3.0
|
||||||
Release: 3
|
Release: 4
|
||||||
Summary: TIFF Library and Utilities
|
Summary: TIFF Library and Utilities
|
||||||
License: libtiff
|
License: libtiff
|
||||||
URL: https://www.simplesystems.org/libtiff/
|
URL: https://www.simplesystems.org/libtiff/
|
||||||
Source0: https://download.osgeo.org/libtiff/tiff-%{version}.tar.gz
|
Source0: https://download.osgeo.org/libtiff/tiff-%{version}.tar.gz
|
||||||
|
|
||||||
|
Patch9000: fix-raw2tiff-floating-point-exception.patch
|
||||||
|
|
||||||
BuildRequires: gcc gcc-c++ zlib-devel libjpeg-devel jbigkit-devel
|
BuildRequires: gcc gcc-c++ zlib-devel libjpeg-devel jbigkit-devel
|
||||||
BuildRequires: libtool automake autoconf pkgconfig
|
BuildRequires: libtool automake autoconf pkgconfig
|
||||||
|
|
||||||
@ -112,6 +114,9 @@ find html -name 'Makefile*' | xargs rm
|
|||||||
%exclude %{_datadir}/html/man/tiffgt.1.html
|
%exclude %{_datadir}/html/man/tiffgt.1.html
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* 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
|
* Mon Dec 13 2021 liuyumeng <liuyumeng5@huawei.com> - 4.3.0-3
|
||||||
- fix incorrect writing when unpacking in spec
|
- fix incorrect writing when unpacking in spec
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user