upstream fix frequent renderer crashes; rel 3

see https://bugreports.qt.io/browse/QTBUG-86752

diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec
index 987ff0bd880e778f01fe1d3e8bb8a4f599643409..3ace0b1ce906491de5c7ca0748fd7d5c89f9c2c4 100644 (file)
--- a/qt5-qtwebengine.spec
+++ b/qt5-qtwebengine.spec
@@ -8,12 +8,13 @@ Summary:      The Qt5 WebEngine library
 Summary(pl.UTF-8):     Biblioteka Qt5 WebEngine
 Name:          qt5-%{orgname}
 Version:       5.15.1
 Summary(pl.UTF-8):     Biblioteka Qt5 WebEngine
 Name:          qt5-%{orgname}
 Version:       5.15.1

-Release:       2
+Release:       3

 License:       LGPL v3 or GPL v2+ or commercial
 Group:         X11/Libraries
 Source0:       http://download.qt.io/official_releases/qt/5.15/%{version}/submodules/%{orgname}-everywhere-src-%{version}.tar.xz
 # Source0-md5: e37c44664e8a55471b92b07695f7f7db
 Patch0:                x32.patch
 License:       LGPL v3 or GPL v2+ or commercial
 Group:         X11/Libraries
 Source0:       http://download.qt.io/official_releases/qt/5.15/%{version}/submodules/%{orgname}-everywhere-src-%{version}.tar.xz
 # Source0-md5: e37c44664e8a55471b92b07695f7f7db
 Patch0:                x32.patch

+Patch1:                renderer_crash.patch

 URL:           http://www.qt.io/
 BuildRequires: Mesa-khrplatform-devel
 BuildRequires: Qt5Core-devel >= %{version}
 URL:           http://www.qt.io/
 BuildRequires: Mesa-khrplatform-devel
 BuildRequires: Qt5Core-devel >= %{version}


@@ -224,6 +225,9 @@ Biblioteka Qt5 Pdf - pliki programistyczne.
 %ifarch x32
 %patch0 -p1
 %endif
 %ifarch x32
 %patch0 -p1
 %endif

+cd src/3rdparty
+%patch1 -p1
+cd ../..

 
 %build
 %ifarch x32
 
 %build
 %ifarch x32

diff --git a/renderer_crash.patch b/renderer_crash.patch
new file mode 100644 (file)
index 0000000..2ab4dad
--- /dev/null
+++ b/renderer_crash.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/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
+@@ -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*