ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

blind fix to lua socket receive string which supports embedded nulls and probably fixes rarer cases where long codepoints got broken up. re #2671

This commit is contained in:
zeromus 2021-03-21 21:28:24 -04:00
parent fafa29a2bf
commit c252ac2934
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/BizHawk.Client.Common/Api/SocketServer.cs
View File

@ -79,23 +79,25 @@ namespace BizHawk.Client.Common
Connect();
}
var encoding1 = encoding ?? Encoding.UTF8;
var resp = "";
var receivedBytes = new byte[256];
var receivedLength = 1;
while (receivedLength > 0)
System.IO.MemoryStream ms = new System.IO.MemoryStream();
for(; ;)
{
try
{
receivedLength = _soc.Receive(receivedBytes, receivedBytes.Length, 0);
resp += encoding1.GetString(receivedBytes);
int receivedLength = _soc.Receive(receivedBytes, receivedBytes.Length, 0);
if (receivedLength == 0)
break;
ms.Write(receivedBytes, 0, receivedLength);
}
catch
{
receivedLength = 0;
ms.SetLength(0);
break;
}
}
return resp;
var myencoding = encoding ?? Encoding.UTF8;
return myencoding.GetString(ms.ToArray(), 0, (int)ms.Length);
}
public int SendBytes(byte[] sendBytes)