From 6eb14972adb82796ffa10a14c03553399bee230c Mon Sep 17 00:00:00 2001
From: RazvanN7 <razvan.nitu1305@gmail.com>
Date: Mon, 13 Sep 2021 14:02:55 +0300
Subject: [PATCH] Fix Issue 22301 - Only use from if a packet was actually
 received

---
 std/socket.d | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/std/socket.d b/std/socket.d
index 8d22ed338..0574f10fa 100644
--- a/std/socket.d
+++ b/std/socket.d
@@ -3119,25 +3119,17 @@ public:
             from = createAddress();
         socklen_t nameLen = from.nameLen;
         version (Windows)
-        {
             auto read = .recvfrom(sock, buf.ptr, capToInt(buf.length), cast(int) flags, from.name, &nameLen);
-            if (read >= 0)
-            {
-                from.setNameLen(nameLen);
-                assert(from.addressFamily == _family);
-            }
-            return read;
-        }
+
         else
-        {
             auto read = .recvfrom(sock, buf.ptr, buf.length, cast(int) flags, from.name, &nameLen);
-            if (read >= 0)
-            {
-                from.setNameLen(nameLen);
-                assert(from.addressFamily == _family);
-            }
-            return read;
+
+        if (read >= 0)
+        {
+            from.setNameLen(nameLen);
+            assert(from.addressFamily == _family);
         }
+        return read;
     }