kapitan/IXWebSocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Socket::readLine works with arbitrary long lines

Browse Source
This commit is contained in:
Benjamin Sergeant 2019-01-03 18:47:01 -08:00
parent d75753ec98
commit af3df5e519
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ixwebsocket/IXSocket.cpp
View File

@ -236,27 +236,20 @@ namespace ix
std::pair<bool, std::string> Socket::readLine(const CancellationRequest& isCancellationRequested) std::pair<bool, std::string> Socket::readLine(const CancellationRequest& isCancellationRequested)
{ {
// FIXME: N should be a parameter char c;
std::string line;
line.reserve(64);
// Read first line for (int i = 0; i < 2 || (line[i-2] != '\r' && line[i-1] != '\n'); ++i)
const int N = 255;
char line[N+1];
int i;
for (i = 0; i < 2 || (i < N && line[i-2] != '\r' && line[i-1] != '\n'); ++i)
{ {
if (!readByte(line+i, isCancellationRequested)) if (!readByte(&c, isCancellationRequested))
{ {
return std::make_pair(false, std::string()); return std::make_pair(false, std::string());
} }
line += c;
} }
if (i == N) return std::make_pair(true, line);
{
return std::make_pair(false, std::string());
}
line[i] = 0;
return std::make_pair(true, std::string(line));
} }
} }