From fcd4f61e7bf4c910ffe01303c2d29d419fbdda06 Mon Sep 17 00:00:00 2001
From: wk333 <13474090681@163.com>
Date: Wed, 17 Apr 2024 10:44:21 +0800
Subject: [PATCH] Fix CVE-2024-31047

---
 CVE-2024-31047.patch | 42 ++++++++++++++++++++++++++++++++++++++++++
 OpenEXR.spec         |  6 +++++-
 2 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 CVE-2024-31047.patch

diff --git a/CVE-2024-31047.patch b/CVE-2024-31047.patch
new file mode 100644
index 0000000..91bebae
--- /dev/null
+++ b/CVE-2024-31047.patch
@@ -0,0 +1,42 @@
+From 7aa89e1d09b09d9f5dbb96976ee083a331ab9d71 Mon Sep 17 00:00:00 2001
+From: xiaoxiaoafeifei <zhailiangliang@loongson.cn>
+Date: Wed, 20 Mar 2024 00:09:05 +0800
+Subject: [PATCH] prevent integer overflows in file exrmultipart.cpp (#1681)
+
+Signed-off-by: ZhaiLiangliang <zhailiangliang@loongson.cn>
+
+Origin: https://github.com/AcademySoftwareFoundation/openexr/pull/1681
+
+---
+ exrmultipart/exrmultipart.cpp | 13 +++++++++----
+ 1 file changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/exrmultipart/exrmultipart.cpp b/exrmultipart/exrmultipart.cpp
+index 931cebc..1c624b8 100644
+--- a/exrmultipart/exrmultipart.cpp
++++ b/exrmultipart/exrmultipart.cpp
+@@ -326,12 +326,17 @@ convert(vector <const char*> in,
+         }
+         
+         Box2i dataWindow = infile.header(0).dataWindow();
+-        int pixel_count = (dataWindow.size().y+1)*(dataWindow.size().x+1);
+-        int pixel_width = dataWindow.size().x+1;
+-        
++        //
++        // use int64_t for dimensions, since possible overflow int storage
++        //
++        int64_t pixel_count = (static_cast<int64_t>(dataWindow.size ().y) + 1) * (static_cast<int64_t>(dataWindow.size ().x) + 1);
++        int64_t pixel_width = static_cast<int64_t>(dataWindow.size ().x) + 1;
+         
++        //
+         // offset in pixels between base of array and 0,0
+-        int pixel_base = dataWindow.min.y*pixel_width+dataWindow.min.x;
++        // use int64_t for dimensions, since dataWindow.min.y * pixel_width could overflow int storage
++        //
++        int64_t pixel_base = static_cast<int64_t>(dataWindow.min.y) * pixel_width + static_cast<int64_t>(dataWindow.min.x);
+ 
+         vector< vector<char> > channelstore(channel_count);
+         
+-- 
+2.43.0
+
diff --git a/OpenEXR.spec b/OpenEXR.spec
index f0b16a6..a6aa60b 100644
--- a/OpenEXR.spec
+++ b/OpenEXR.spec
@@ -1,7 +1,7 @@
 Name:           OpenEXR
 Summary:        A high dynamic-range (HDR) image file format for use in computer imaging applications
 Version:        2.2.0
-Release:        28
+Release:        29
 License:        BSD
 URL:	        http://www.openexr.com/
 Source0:        http://download.savannah.nongnu.org/releases/openexr/openexr-%{version}.tar.gz
@@ -39,6 +39,7 @@ Patch0025:      CVE-2021-20302.patch
 Patch0026:      CVE-2021-3933.patch
 Patch0027:      CVE-2021-20304.patch
 Patch0028:      CVE-2021-20298.patch
+Patch0029:      CVE-2024-31047.patch
 
 BuildConflicts: %{name}-devel < 2.2.0
 BuildRequires:  gcc-c++ ilmbase-devel >= %{version} zlib-devel pkgconfig
@@ -102,6 +103,9 @@ test "$(pkg-config --modversion OpenEXR)" = "%{version}"
 %{_libdir}/pkgconfig/OpenEXR.pc
 
 %changelog
+* Wed Apr 17 2024 wangkai <13474090681@163.com> - 2.2.0-29
+- Fix CVE-2024-31047
+
 * Thu Aug 25 2022 mayp <mayanping@ncti-gba.cn> - 2.2.0-28
 - Fix CVE-2021-20298 
 
-- 
Gitee