Fix NullReferenceException in StartReceive method (#39)

tmds · Jan 4, 2021 · 82f52b2 · 82f52b2
1 parent 01f0ba7
commit 82f52b2
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/Tmds.MDns/NetworkInterfaceHandler.cs b/src/Tmds.MDns/NetworkInterfaceHandler.cs
@@ -126,9 +126,14 @@ internal void Send(IList<ArraySegment<byte>> packets)
         {
             try
             {
+                var socket = _socket;
+                if (socket == null)
+                {
+                    return;
+                }
                 foreach (ArraySegment<byte> segment in packets)
                 {
-                    _socket.SendTo(segment.Array, segment.Offset, segment.Count, SocketFlags.None, IPv4EndPoint);
+                    socket.SendTo(segment.Array, segment.Offset, segment.Count, SocketFlags.None, IPv4EndPoint);
                 }
             }
             catch
@@ -194,7 +199,7 @@ private void OnReceive(IAsyncResult ar)
             lock (this)
             {
 #if NETSTANDARD1_3
-                if (args.SocketError != SocketError.Success)
+                if (args.SocketError != SocketError.Success || _socket == null)
                 {
                     return;
                 }
@@ -239,7 +244,7 @@ private void OnReceive(IAsyncResult ar)
                                 }
                             }
                         }
-                    }
+                    }
                     if (header.IsResponse && header.IsNoError)
                     {
                         for (int i = 0; i < header.QuestionCount; i++)