From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E8EFE138359 for ; Thu, 22 Oct 2020 17:24:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ABE5BE084A; Thu, 22 Oct 2020 17:24:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8F2FEE084A for ; Thu, 22 Oct 2020 17:24:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 138D5340DFB for ; Thu, 22 Oct 2020 17:24:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8343139F for ; Thu, 22 Oct 2020 17:24:18 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1603387449.9b903750a9a89f7a788370261daff9a8ac0bfe02.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/, www-client/chromium/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/chromium/chromium-86.0.4240.111-r1.ebuild www-client/chromium/chromium-86.0.4240.111.ebuild www-client/chromium/chromium-87.0.4280.20-r1.ebuild www-client/chromium/chromium-87.0.4280.20.ebuild www-client/chromium/files/chromium-87-xproto-crash.patch X-VCS-Directories: www-client/chromium/ www-client/chromium/files/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 9b903750a9a89f7a788370261daff9a8ac0bfe02 X-VCS-Branch: master Date: Thu, 22 Oct 2020 17:24:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b7267db6-d8e0-4028-a579-c8297e8c3f29 X-Archives-Hash: 4f1cac6eb5c3af561f9091c2f2dba7fd commit: 9b903750a9a89f7a788370261daff9a8ac0bfe02 Author: Mike Gilbert gentoo org> AuthorDate: Thu Oct 22 17:23:32 2020 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Thu Oct 22 17:24:09 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b903750 www-client/chromium: backport crash fix Signed-off-by: Mike Gilbert gentoo.org> ...111.ebuild => chromium-86.0.4240.111-r1.ebuild} | 5 ++- ...0.20.ebuild => chromium-87.0.4280.20-r1.ebuild} | 8 +++-- .../chromium/files/chromium-87-xproto-crash.patch | 38 ++++++++++++++++++++++ 3 files changed, 48 insertions(+), 3 deletions(-) diff --git a/www-client/chromium/chromium-86.0.4240.111.ebuild b/www-client/chromium/chromium-86.0.4240.111-r1.ebuild similarity index 99% rename from www-client/chromium/chromium-86.0.4240.111.ebuild rename to www-client/chromium/chromium-86.0.4240.111-r1.ebuild index df085819384..3afc7420f13 100644 --- a/www-client/chromium/chromium-86.0.4240.111.ebuild +++ b/www-client/chromium/chromium-86.0.4240.111-r1.ebuild @@ -235,7 +235,10 @@ src_prepare() { # Calling this here supports resumption via FEATURES=keepwork python_setup - eapply "${WORKDIR}/patches" + local PATCHES=( + "${WORKDIR}/patches" + "${FILESDIR}/chromium-87-xproto-crash.patch" + ) default diff --git a/www-client/chromium/chromium-87.0.4280.20.ebuild b/www-client/chromium/chromium-87.0.4280.20-r1.ebuild similarity index 99% rename from www-client/chromium/chromium-87.0.4280.20.ebuild rename to www-client/chromium/chromium-87.0.4280.20-r1.ebuild index 15eece70ebe..bf67a111684 100644 --- a/www-client/chromium/chromium-87.0.4280.20.ebuild +++ b/www-client/chromium/chromium-87.0.4280.20-r1.ebuild @@ -231,9 +231,13 @@ src_prepare() { # Calling this here supports resumption via FEATURES=keepwork python_setup - eapply "${WORKDIR}/patches" + local PATCHES=( + "${WORKDIR}/patches" + "${FILESDIR}/chromium-87-xproto-crash.patch" + ) + if use vaapi; then - eapply "${FILESDIR}/chromium-86-fix-vaapi-on-intel.patch" + PATCHES+=( "${FILESDIR}/chromium-86-fix-vaapi-on-intel.patch" ) fi default diff --git a/www-client/chromium/files/chromium-87-xproto-crash.patch b/www-client/chromium/files/chromium-87-xproto-crash.patch new file mode 100644 index 00000000000..d0dc391e8f1 --- /dev/null +++ b/www-client/chromium/files/chromium-87-xproto-crash.patch @@ -0,0 +1,38 @@ +From 6e50c5a3abfa22eb17e26086bffbee288d07483e Mon Sep 17 00:00:00 2001 +From: Tom Anderson +Date: Thu, 22 Oct 2020 01:05:44 +0000 +Subject: [PATCH] [XProto] Fix crash in media::UserInputMonitorLinuxCore::DispatchXEvent + +The X server may send unsolicited events (from clients calling +XSendEvent() or from new keyboard mappings). So we must check that +the event is the correct type before dispatching it. + +R=dalecurtis + +Change-Id: Ic3e19f7da1415c358991609c9b016bd60ead2038 +Bug: 1140927 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2490674 +Commit-Queue: Thomas Anderson +Auto-Submit: Thomas Anderson +Reviewed-by: Dale Curtis +Cr-Commit-Position: refs/heads/master@{#819650} +--- + +diff --git a/media/base/user_input_monitor_linux.cc b/media/base/user_input_monitor_linux.cc +index 59e655f..13c373f 100644 +--- a/media/base/user_input_monitor_linux.cc ++++ b/media/base/user_input_monitor_linux.cc +@@ -115,9 +115,10 @@ + DCHECK(io_task_runner_->BelongsToCurrentThread()); + + auto* raw = event->As(); +- DCHECK(raw); +- DCHECK(raw->opcode == x11::Input::RawDeviceEvent::RawKeyPress || +- raw->opcode == x11::Input::RawDeviceEvent::RawKeyRelease); ++ if (!raw || (raw->opcode != x11::Input::RawDeviceEvent::RawKeyPress && ++ raw->opcode != x11::Input::RawDeviceEvent::RawKeyRelease)) { ++ return; ++ } + + ui::EventType type = raw->opcode == x11::Input::RawDeviceEvent::RawKeyPress + ? ui::ET_KEY_PRESSED