Date: Thursday, March 11, 2021 @ 13:44:08 Author: heftig Revision: 409612
86.0.1-1 Modified: firefox/trunk/PKGBUILD Deleted: firefox/trunk/0002-Bug-1694670.-Fix-the-OOB-check-in-write_u32-u16.-r-a.patch -----------------------------------------------------------------+ 0002-Bug-1694670.-Fix-the-OOB-check-in-write_u32-u16.-r-a.patch | 34 ---------- PKGBUILD | 11 --- 2 files changed, 3 insertions(+), 42 deletions(-) Deleted: 0002-Bug-1694670.-Fix-the-OOB-check-in-write_u32-u16.-r-a.patch =================================================================== --- 0002-Bug-1694670.-Fix-the-OOB-check-in-write_u32-u16.-r-a.patch 2021-03-11 11:46:30 UTC (rev 409611) +++ 0002-Bug-1694670.-Fix-the-OOB-check-in-write_u32-u16.-r-a.patch 2021-03-11 13:44:08 UTC (rev 409612) @@ -1,34 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jeff Muizelaar <jmuizel...@mozilla.com> -Date: Thu, 25 Feb 2021 13:18:47 +0000 -Subject: [PATCH] Bug 1694670. Fix the OOB check in write_u32/u16. r=aosmond, - a=RyanVM - -Differential Revision: https://phabricator.services.mozilla.com/D106362 ---- - gfx/qcms/src/iccread.rs | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gfx/qcms/src/iccread.rs b/gfx/qcms/src/iccread.rs -index 0113e17aff3e6..f1107d50a86b6 100644 ---- a/gfx/qcms/src/iccread.rs -+++ b/gfx/qcms/src/iccread.rs -@@ -229,16 +229,16 @@ fn read_uInt16Number(mem: &mut MemSource, offset: usize) -> uInt16Number { - 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(); - unsafe { - std::ptr::write_unaligned(mem.add(offset) as *mut u32, cpu_to_be32(value)); - } - } - 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(); Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-03-11 11:46:30 UTC (rev 409611) +++ PKGBUILD 2021-03-11 13:44:08 UTC (rev 409612) @@ -3,8 +3,8 @@ # Contributor: Jakub Schmidtke <sja...@gmail.com> pkgname=firefox -pkgver=86.0 -pkgrel=2 +pkgver=86.0.1 +pkgrel=1 pkgdesc="Standalone web browser from mozilla.org" arch=(x86_64) license=(MPL GPL LGPL) @@ -21,12 +21,10 @@ options=(!emptydirs !makeflags !strip) source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc} 0001-Use-remoting-name-for-GDK-application-names.patch - 0002-Bug-1694670.-Fix-the-OOB-check-in-write_u32-u16.-r-a.patch $pkgname.desktop) -sha256sums=('c3ac474a2cf6a8e31a962f57c7357dbe67b5088b6aceea9980f25ce7a99b58dd' +sha256sums=('74f99c226ae6747f0170566f4f88be410866b0120214d2a593566cd1fff3d3df' 'SKIP' 'ea8c317a50e84829c3b94ad73b5b9cfb8a08a73e406f8bd9bfb7730854611539' - '7ca4d5270c5bf4505ab867807bfff65b30cd1d0d8c50b76b406a3233ae3b5ad3' '298eae9de76ec53182f38d5c549d0379569916eebf62149f9d7f4a7edef36abf') validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <rele...@mozilla.com> @@ -49,9 +47,6 @@ # https://bugzilla.mozilla.org/show_bug.cgi?id=1530052 patch -Np1 -i ../0001-Use-remoting-name-for-GDK-application-names.patch - # https://bugs.archlinux.org/task/69821 - patch -Np1 -i ../0002-Bug-1694670.-Fix-the-OOB-check-in-write_u32-u16.-r-a.patch - echo -n "$_google_api_key" >google-api-key echo -n "$_mozilla_api_key" >mozilla-api-key