From 9be1c08c8cd714e3e3fc523bb3e60bd07ca9de09 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Sat, 31 Jul 2021 23:03:48 +1200
Subject: [PATCH] Fix domain server crash

---
 libraries/networking/src/webrtc/WebRTCDataChannels.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/libraries/networking/src/webrtc/WebRTCDataChannels.cpp b/libraries/networking/src/webrtc/WebRTCDataChannels.cpp
index 1fd9ae42e5..974cef2997 100644
--- a/libraries/networking/src/webrtc/WebRTCDataChannels.cpp
+++ b/libraries/networking/src/webrtc/WebRTCDataChannels.cpp
@@ -339,14 +339,20 @@ qint64 WDCConnection::getBufferedAmount() const {
 #ifdef WEBRTC_DEBUG
     qCDebug(networking_webrtc) << "WDCConnection::getBufferedAmount()";
 #endif
-    return _dataChannel->buffered_amount();
+    return _dataChannel ? _dataChannel->buffered_amount() : 0;
 }
 
 bool WDCConnection::sendDataMessage(const DataBuffer& buffer) {
 #ifdef WEBRTC_DEBUG
     qCDebug(networking_webrtc) << "WDCConnection::sendDataMessage()";
+    if (!_dataChannel) {
+        qCDebug(networking_webrtc) << "No data channel to send on";
+    }
 #endif
-    if (_dataChannel->buffered_amount() + buffer.size() > MAX_WEBRTC_BUFFER_SIZE) {
+    if (!_dataChannel) {
+        // Data channel may have been closed while message to send was being prepared.
+        return false;
+    } else if (_dataChannel->buffered_amount() + buffer.size() > MAX_WEBRTC_BUFFER_SIZE) {
         // Don't send, otherwise the data channel will be closed.
         qCDebug(networking_webrtc) << "WebRTC send buffer overflow";
         return false;