Merge remote-tracking branch 'remotes/makaopior/feature/encoding-fix'

# Conflicts:
#	WhoisClient.NET/WhoisClient.cs

Author: jsakamoto

RELEASE-NOTES.txt

@@ -1,5 +1,6 @@
 v.5.3.0
 - Fixed potential infinite loop in socket reading method
+- Fixed potential response string corruption for registries which use multi-byte encoding
 
 v.5.2.0
 - Moved TcpClient creation to separate class, enabling usage in special cases like flowing traffic through SOCKS proxy

WhoisClient.NET/WhoisClient.cs

@@ -298,7 +298,7 @@ private static string RawQuery(string query, EndPoint server, IQueryOptions opti
                 return string.Empty;
             }
 
-            var res = new StringBuilder();
+            var responseBytes = new List<byte>(4096);
             try
             {
                 using (var s = tcpClient.GetStream())
@@ -317,12 +317,12 @@ private static string RawQuery(string query, EndPoint server, IQueryOptions opti
                     do
                     {
                         cbRead = s.Read(readBuff, 0, readBuff.Length);
-                        res.Append(options.Encoding.GetString(readBuff, 0, cbRead));
+                        responseBytes.AddRange(readBuff.Take(cbRead));
                         if (cbRead > 0)
                             Thread.Sleep(100);
                     } while (cbRead > 0);
 
-                    return res.ToString();
+                    return options.Encoding.GetString(responseBytes.ToArray());
                 }
             }
             catch
@@ -333,7 +333,7 @@ private static string RawQuery(string query, EndPoint server, IQueryOptions opti
                 if (options.RethrowExceptions)
                     throw;
 
-                return res.ToString();
+                return options.Encoding.GetString(responseBytes.ToArray());
             }
             finally
             {
@@ -405,7 +405,7 @@ private static async Task<string> RawQueryAsync(string query, EndPoint server, I
                 return string.Empty;
             }
 
-            var res = new StringBuilder();
+            var responseBytes = new List<byte>(4096);
             try
             {
                 using (var s = tcpClient.GetStream())
@@ -424,12 +424,12 @@ private static async Task<string> RawQueryAsync(string query, EndPoint server, I
                     do
                     {
                         cbRead = await s.ReadAsync(readBuff, 0, buffSize, token).ConfigureAwait(false);
-                        res.Append(options.Encoding.GetString(readBuff, 0, cbRead));
+                        responseBytes.AddRange(readBuff.Take(cbRead));
                         if (cbRead > 0)
                             await Task.Delay(100, token).ConfigureAwait(false);
                     } while (cbRead > 0);
 
-                    return res.ToString();
+                    return options.Encoding.GetString(responseBytes.ToArray());
                 }
             }
             catch (Exception)
@@ -440,7 +440,7 @@ private static async Task<string> RawQueryAsync(string query, EndPoint server, I
                 if (options.RethrowExceptions)
                     throw;
 
-                return res.ToString();
+                return options.Encoding.GetString(responseBytes.ToArray());
             }
             finally
             {