summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel McArdle <dmcardle@chromium.org>2020-04-16 20:18:47 +0000
committerMichael BrĂ¼ning <michael.bruning@qt.io>2020-09-29 14:42:24 +0000
commit4e828b3bd2d410151dc2574d084bed631dac42ca (patch)
tree52a836520ce7b103b2af4c21ba4d24c21b01a801
parent62bc475876cbae17e2e39175fe321780512e5951 (diff)
downloadqtwebengine-chromium-80-based.tar.gz
[Backport] Fix for bug 107132780-based
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>
-rw-r--r--chromium/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection_handler.cc6
1 files changed, 4 insertions, 2 deletions
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 5a68327ee08..371f25c781e 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::OnRemoveReceiverPlanB(uintptr_t receiver_id) {
void RTCPeerConnectionHandler::OnModifySctpTransport(
blink::WebRTCSctpTransportSnapshot state) {
- client_->DidModifySctpTransport(state);
+ if (client_)
+ client_->DidModifySctpTransport(state);
}
void RTCPeerConnectionHandler::OnModifyTransceivers(
@@ -2446,7 +2447,8 @@ void RTCPeerConnectionHandler::OnIceCandidateError(const String& host_candidate,
}
void RTCPeerConnectionHandler::OnInterestingUsage(int usage_pattern) {
- client_->DidNoteInterestingUsage(usage_pattern);
+ if (client_)
+ client_->DidNoteInterestingUsage(usage_pattern);
}
webrtc::SessionDescriptionInterface*