[PR PATCH] qt5-webengine: apply upstream backported nullptr patch

[PR PATCH] qt5-webengine: apply upstream backported nullptr patch

[klardotsh]

[-- Attachment #1: Type: text/plain, Size: 688 bytes --]

There is a new pull request by klardotsh against master on the void-packages repository

https://github.com/klardotsh/void-packages klardotsh/qtwebengine-patch-webrtc
https://github.com/void-linux/void-packages/pull/25949

qt5-webengine: apply upstream backported nullptr patch
Refs qutebrowser/qutebrowser#5721, applies upstream patch https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/315691 which resolves renderer crashes in some WebRTC flows (it's especially bad in video calls, eg. Hangouts and Jitsi, where I routinely drop off the call by way of tab crashes every few minutes).

A patch file from https://github.com/void-linux/void-packages/pull/25949.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-klardotsh/qtwebengine-patch-webrtc-25949.patch --]
[-- Type: text/x-diff, Size: 2826 bytes --]

From 733936dde4024e142199fc99b2a506d0a39e88ea Mon Sep 17 00:00:00 2001
From: Josh Klar <josh@klar.sh>
Date: Wed, 28 Oct 2020 12:14:08 -0700
Subject: [PATCH] qt5-webengine: apply upstream backported nullptr patch

Refs qutebrowser/qutebrowser#5721
---
 ...200-nullptr-rtcpeerconnectionhandler.patch | 39 +++++++++++++++++++
 srcpkgs/qt5-webengine/template                |  2 +-
 2 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/qt5-webengine/patches/0200-nullptr-rtcpeerconnectionhandler.patch

diff --git a/srcpkgs/qt5-webengine/patches/0200-nullptr-rtcpeerconnectionhandler.patch b/srcpkgs/qt5-webengine/patches/0200-nullptr-rtcpeerconnectionhandler.patch
new file mode 100644
index 00000000000..3c650f30559
--- /dev/null
+++ b/srcpkgs/qt5-webengine/patches/0200-nullptr-rtcpeerconnectionhandler.patch
@@ -0,0 +1,39 @@
+From 4e828b3bd2d410151dc2574d084bed631dac42ca Mon Sep 17 00:00:00 2001
+From: Daniel McArdle <dmcardle@chromium.org>
+Date: Thu, 16 Apr 2020 20:18:47 +0000
+Subject: [PATCH] [Backport] Fix for bug 1071327
+
+Manual backport of patch originally reviewed on
+https://chromium-review.googlesource.com/c/chromium/src/+/2153325:
+Avoid nullptr dereference in RTCPeerConnectionHandler
+
+Bug: 1071327
+Fixes: QTBUG-86752
+Change-Id: Icf4189905dc5c95854b5af4b3e5e25e0607dd39e
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
+---
+
+diff --git a/chromium/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection_handler.cc b/chromium/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection_handler.cc
+index 5a68327..371f25c 100644
+--- a/src/3rdparty/chromium/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection_handler.cc
++++ b/src/3rdparty/chromium/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection_handler.cc
+@@ -2319,7 +2319,8 @@
+ 
+ void RTCPeerConnectionHandler::OnModifySctpTransport(
+     blink::WebRTCSctpTransportSnapshot state) {
+-  client_->DidModifySctpTransport(state);
++  if (client_)
++    client_->DidModifySctpTransport(state);
+ }
+ 
+ void RTCPeerConnectionHandler::OnModifyTransceivers(
+@@ -2446,7 +2447,8 @@
+ }
+ 
+ void RTCPeerConnectionHandler::OnInterestingUsage(int usage_pattern) {
+-  client_->DidNoteInterestingUsage(usage_pattern);
++  if (client_)
++    client_->DidNoteInterestingUsage(usage_pattern);
+ }
+ 
+ webrtc::SessionDescriptionInterface*
diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template
index 3a5f4af240a..5191c63435a 100644
--- a/srcpkgs/qt5-webengine/template
+++ b/srcpkgs/qt5-webengine/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5-webengine'
 pkgname=qt5-webengine
 version=5.15.1
-revision=1
+revision=2
 archs="x86_64* i686* armv[67]* ppc64* aarch64*"
 wrksrc="qtwebengine-everywhere-src-${version}"
 build_style=qmake

Re: qt5-webengine: apply upstream backported nullptr patch

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 220 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/25949#issuecomment-718163406

Comment:
Hm, I wonder if Firefox needs a similar patch. I've been having issues with it.

Re: qt5-webengine: apply upstream backported nullptr patch

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 233 bytes --]

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/25949#issuecomment-718169071

Comment:
I would prefer to merge this together with qt5.15.2, which should be released next week.

Re: qt5-webengine: apply upstream backported nullptr patch

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 222 bytes --]

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/25949#issuecomment-718169071

Comment:
I will merge this together with qt5.15.2, which should be released next week.

Re: qt5-webengine: apply upstream backported nullptr patch

[klardotsh]

[-- Attachment #1: Type: text/plain, Size: 270 bytes --]

New comment by klardotsh on void-packages repository

https://github.com/void-linux/void-packages/pull/25949#issuecomment-718183629

Comment:
This patch is only relevant for qt5.15.1, as it's a backported patch from 5.15.2. in the meantime, WebRTC is highly unreliable.

Re: qt5-webengine: apply upstream backported nullptr patch

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 389 bytes --]

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/25949#issuecomment-718248186

Comment:
> This patch is only relevant for qt5.15.1, as it's a backported patch from 5.15.2. in the meantime, WebRTC is highly unreliable.

True, I'm just bad at reading dates, I somehow thought that the 29th of September wasn't already a month ago...

Re: qt5-webengine: apply upstream backported nullptr patch

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 240 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/25949#issuecomment-744628176

Comment:
I'm testing locally, will merge when the builders are free. Qt 5.12 is unlikely to get merged soon.

Re: qt5-webengine: apply upstream backported nullptr patch

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 227 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/25949#issuecomment-744628176

Comment:
I'm testing locally, will merge when the builders are free. Qt 5.15.2 isn't ready yet.

Re: [PR PATCH] [Merged]: qt5-webengine: apply upstream backported nullptr patch

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 506 bytes --]

There's a merged pull request on the void-packages repository

qt5-webengine: apply upstream backported nullptr patch
https://github.com/void-linux/void-packages/pull/25949

Description:
Refs qutebrowser/qutebrowser#5721, applies upstream patch https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/315691 which resolves renderer crashes in some WebRTC flows (it's especially bad in video calls, eg. Hangouts and Jitsi, where I routinely drop off the call by way of tab crashes every few minutes).