From 733936dde4024e142199fc99b2a506d0a39e88ea Mon Sep 17 00:00:00 2001 From: Josh Klar 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 +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 +--- + +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