pool/godot
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1003055 from home:cunix:godot

Browse Source 
Heap-buffer-overflow in bundled thirdparty tool tinyexr

OBS-URL: https://build.opensuse.org/request/show/1003055
OBS-URL: https://build.opensuse.org/package/show/games/godot?expand=0&rev=46
This commit is contained in:
c unix 2022-09-16 16:11:35 +00:00 committed by Git OBS Bridge
parent 525610e395
commit 3e0b8dbb0d
3 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
godot.changes
View File

@ -1,3 +1,8 @@
Mon Sep 12 12:00:00 UTC 2022 - cunix@mail.de
- Heap-buffer-overflow in bundled thirdparty tool tinyexr
* added tinyexr_thirdparty_upstream.patch from upstream tinyexr (boo#1203278)
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Aug 6 12:00:00 UTC 2022 - cunix@mail.de Sat Aug 6 12:00:00 UTC 2022 - cunix@mail.de

3
godot.spec
View File

@ -36,6 +36,8 @@ Source1: https://downloads.tuxfamily.org/godotengine/%{version}/%{name}-%
Patch0: linker_pie_flag.patch Patch0: linker_pie_flag.patch
# Use system certificates as fallback for certificates # Use system certificates as fallback for certificates
Patch1: certs_fallback.patch Patch1: certs_fallback.patch
# Heap-buffer-overflow in bundled tinyexr
Patch2: tinyexr_thirdparty_upstream.patch
BuildRequires: Mesa-devel BuildRequires: Mesa-devel
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: fdupes BuildRequires: fdupes
@ -243,6 +245,7 @@ Bash command line completion support for %{name}, %{name}-headless,
%setup -q -n %{name}-%{version}-stable %setup -q -n %{name}-%{version}-stable
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1
cp thirdparty/README.md thirdparty_README.md cp thirdparty/README.md thirdparty_README.md

25
tinyexr_thirdparty_upstream.patch Normal file
View File

@ -0,0 +1,25 @@
From cc1b199dd17b700c3130a53866ea462ab88e7f82 Mon Sep 17 00:00:00 2001
From: 0xdd96 <1011085630@qq.com>
Date: Wed, 6 Jul 2022 12:14:50 +0800
Subject: [PATCH] Add bounds check to address #169
References: https://bugzilla.opensuse.org/show_bug.cgi?id=1203278
https://github.com/syoyo/tinyexr/issues/169
https://github.com/syoyo/tinyexr/pull/170/commits/cc1b199dd17b700c3130a53866ea462ab88e7f82
Rebased: 20220912 by cunix
diff -r -U 5 a/thirdparty/tinyexr/tinyexr.h b/thirdparty/tinyexr/tinyexr.h
--- a/thirdparty/tinyexr/tinyexr.h
+++ b/thirdparty/tinyexr/tinyexr.h
@@ -1454,11 +1454,11 @@
in += count;
} else {
int count = *in++;
inLength -= 2;
- if (0 > (maxLength -= count + 1)) return 0;
+ if (0 > (maxLength -= count + 1) || inLength < 0) return 0;
memset(out, *reinterpret_cast<const char *>(in), count + 1);
out += count + 1;
in++;