python
diff --git a/‎Misc/NEWS.d/next/Windows/2021-04-21-23-37-34.bpo-26227.QMY_eA.rst‎
Lines changed: 2 additions & 0 deletions b/‎Misc/NEWS.d/next/Windows/2021-04-21-23-37-34.bpo-26227.QMY_eA.rst‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎Modules/socketmodule.c‎
Lines changed: 1 addition & 1 deletion b/‎Modules/socketmodule.c‎
Lines changed: 1 addition & 1 deletion
@@ -0,0 +1,2 @@
+Fixed decoding of host names in :func:`socket.gethostbyaddr` and
+:func:`socket.gethostbyname_ex`.
@@ -5508,7 +5508,7 @@ sock_decode_hostname(const char *name)
 #ifdef MS_WINDOWS
     /* Issue #26227: gethostbyaddr() returns a string encoded
      * to the ANSI code page */
-    return PyUnicode_DecodeFSDefault(name);
+    return PyUnicode_DecodeMBCS(name, strlen(name), "surrogatepass");
 #else
     /* Decode from UTF-8 */
     return PyUnicode_FromString(name);
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+Fixed decoding of host names in :func:`socket.gethostbyaddr` and
	`2`	+:func:`socket.gethostbyname_ex`.