From b878b84984d5a9bf15beabb24ee30daa8ea6f7c2 Mon Sep 17 00:00:00 2001 From: zhangxingrong Date: Wed, 10 Jul 2024 17:17:31 +0800 Subject: [PATCH] Fix file descriptor leak in HDR decoder --- ...-file-descriptor-leak-in-HDR-decoder.patch | 23 +++++++++++++++++++ opencv.spec | 6 ++++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 backport-Fix-file-descriptor-leak-in-HDR-decoder.patch diff --git a/backport-Fix-file-descriptor-leak-in-HDR-decoder.patch b/backport-Fix-file-descriptor-leak-in-HDR-decoder.patch new file mode 100644 index 0000000..ca1b034 --- /dev/null +++ b/backport-Fix-file-descriptor-leak-in-HDR-decoder.patch @@ -0,0 +1,23 @@ +From bbf65a166e027f079835920f117db5725d3ec030 Mon Sep 17 00:00:00 2001 +From: Mikhail Khachayants +Date: Sun, 30 Jun 2024 18:43:04 +0300 +Subject: [PATCH] Fix file descriptor leak in HDR decoder + +--- + modules/imgcodecs/src/grfmt_hdr.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/modules/imgcodecs/src/grfmt_hdr.cpp b/modules/imgcodecs/src/grfmt_hdr.cpp +index 3a18b5bbebc4..c9fec94aa329 100644 +--- a/modules/imgcodecs/src/grfmt_hdr.cpp ++++ b/modules/imgcodecs/src/grfmt_hdr.cpp +@@ -59,6 +59,9 @@ HdrDecoder::HdrDecoder() + + HdrDecoder::~HdrDecoder() + { ++ if(file) { ++ fclose(file); ++ } + } + + size_t HdrDecoder::signatureLength() const diff --git a/opencv.spec b/opencv.spec index c2544dd..0ebfe5d 100644 --- a/opencv.spec +++ b/opencv.spec @@ -1,6 +1,6 @@ Name: opencv Version: 4.5.2 -Release: 9 +Release: 10 Summary: OpenCV means IntelĀ® Open Source Computer Vision Library. License: Apache-2.0 URL: https://github.com/opencv/opencv @@ -18,6 +18,7 @@ Patch4: CVE-2022-0561_and_CVE-2022-0562.patch Patch5: CVE-2022-0908.patch Patch6: Merge-pull-request-21114-from-dwardor-patch-1.patch Patch7: calib3d-use-OCV_LAPACK_FUNC.patch +Patch8: backport-Fix-file-descriptor-leak-in-HDR-decoder.patch BuildRequires: qt5-qtbase-devel BuildRequires: gcc-c++ gcc autoconf pkgconfig protobuf-compiler protobuf @@ -106,6 +107,9 @@ make install DESTDIR=%{buildroot} %{python3_sitelib}/cv2/* %changelog +* Wed Jul 10 2024 zhangxingrong- - 4.5.2-10 +- backport upstraem patch to fix file descriptor leak in HDR decoder + * Wed Nov 22 2023 konglidong - 4.5.2-9 - backport upstraem patch to fix build failed -- Gitee