summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--firefox.spec7
-rw-r--r--mozilla-1694670.patch22
2 files changed, 28 insertions, 1 deletions
diff --git a/firefox.spec b/firefox.spec
index 3cb7406..83aae82 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -174,7 +174,7 @@ ExcludeArch: armv7hl
Summary: Mozilla Firefox Web browser
Name: firefox
Version: 86.0
-Release: 6%{?pre_tag}%{?dist}
+Release: 7%{?pre_tag}%{?dist}
URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz
@@ -257,6 +257,7 @@ Patch418: mozilla-1556931-s390x-hidden-syms.patch
Patch429: mozilla-1631061-1.patch
Patch430: mozilla-1631061-2.patch
Patch431: mozilla-1683578.patch
+Patch432: mozilla-1694670.patch
# PGO/LTO patches
Patch600: pgo.patch
@@ -507,6 +508,7 @@ This package contains results of tests executed during build.
%patch429 -p1 -b .1631061
%patch430 -p1 -b .1631061
%patch431 -p1 -b .1683578
+%patch432 -p1 -b .1694670
# PGO patches
%if %{build_with_pgo}
@@ -1082,6 +1084,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
+* Wed Mar 3 2021 Martin Stransky <stransky@redhat.com> - 86.0-7
+- Added fix for mozbz#1694670
+
* Mon Mar 1 2021 Martin Stransky <stransky@redhat.com> - 86.0-6
- Run xpcshell tests sequential
- Test fixes
diff --git a/mozilla-1694670.patch b/mozilla-1694670.patch
new file mode 100644
index 0000000..7c5eb79
--- /dev/null
+++ b/mozilla-1694670.patch
@@ -0,0 +1,22 @@
+diff --git a/gfx/qcms/src/iccread.rs b/gfx/qcms/src/iccread.rs
+--- a/gfx/qcms/src/iccread.rs
++++ b/gfx/qcms/src/iccread.rs
+@@ -229,7 +229,7 @@
+ read_u16(mem, offset)
+ }
+ pub fn write_u32(mem: &mut [u8], offset: usize, value: u32) {
+- if offset <= mem.len() - std::mem::size_of_val(&value) {
++ if offset > mem.len() - std::mem::size_of_val(&value) {
+ panic!("OOB");
+ }
+ let mem = mem.as_mut_ptr();
+@@ -238,7 +238,7 @@
+ }
+ }
+ pub fn write_u16(mem: &mut [u8], offset: usize, value: u16) {
+- if offset <= mem.len() - std::mem::size_of_val(&value) {
++ if offset > mem.len() - std::mem::size_of_val(&value) {
+ panic!("OOB");
+ }
+ let mem = mem.as_mut_ptr();
+
bgstack15