actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixed crash if waiting for data and disconnected.

Browse Source
This commit is contained in:
Charles Lohr
2004-07-18 17:16:02 +00:00
parent cd181d5d1d
commit 5e17b292eb
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ezsockets.cpp
+7 -1
View File
@@ -10,6 +10,7 @@
#include "global.h" // StepMania only includes #include "global.h" // StepMania only includes
#if defined(_XBOX) #if defined(_XBOX)
#elif defined(_WINDOWS) // We need the WinSock32 Library on Windows #elif defined(_WINDOWS) // We need the WinSock32 Library on Windows
#pragma comment(lib,"wsock32.lib") #pragma comment(lib,"wsock32.lib")
@@ -249,6 +250,7 @@ void EzSockets::SendPack(char* data,unsigned int bytes) {
int EzSockets::ReadPack(char* data,unsigned int max) { int EzSockets::ReadPack(char* data,unsigned int max) {
int size = PeekPack(data,max); int size = PeekPack(data,max);
if(size!=-1) if(size!=-1)
inBuffer=inBuffer.substr(size+4); inBuffer=inBuffer.substr(size+4);
@@ -282,11 +284,15 @@ int EzSockets::PeekPack(char* data,unsigned int max) {
if((inBuffer.length()<(size+4)) || (inBuffer.length()<=4)) if((inBuffer.length()<(size+4)) || (inBuffer.length()<=4))
return -1; return -1;
if (IsError())
return -1;
//What if we get disconnected while waiting for data?
string tBuff(inBuffer.substr(4,size)); string tBuff(inBuffer.substr(4,size));
if(tBuff.length()>max) if(tBuff.length()>max)
tBuff.substr(0,max); tBuff.substr(0,max);
memcpy (data,tBuff.c_str(),tBuff.length());
memcpy (data,tBuff.c_str(),tBuff.length());
return size; return size;
} }