Skip to content

fix: maxMsgLength should be 510, independent from line ending (\r\n o… #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gitraphha merged 3 commits into from
Sep 21, 2026
Merged

fix: maxMsgLength should be 510, independent from line ending (\r\n o… #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
340ab17
fix: maxMsgLength should be 510, independant from line ending (\r\n o…
gitraphha Sep 20, 2026
1a4d086
fix: returned position must always be the actual end-of-line position
gitraphha Sep 20, 2026
5836acb
fix: erase buffer content from correct position, depending on one or …
gitraphha Sep 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion includes/Socket.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ class Socket {
std::map<int, SocketIOData> sockIODataStore_;
Logger const &logger_;

size_t bufferLengthAndSanityCheck_(SocketIOData &sIOD, bool &msgTooLong);
size_t bufferLengthAndSanityCheck_(SocketIOData &sIOD, bool &msgTooLong,
size_t &eolSize);
bool checkSocket4Recv(struct pollfd &pfd, SocketIOData &sIOD); // NOLINT

public:
Expand Down
37 changes: 20 additions & 17 deletions srcs/server/Socket.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,46 +72,49 @@ std::string Socket::getCRLFLineFromBuffer(int const fd, bool &buffHasMoreCmds,
return "";
SocketIOData &sIOD = *sIODptr;

size_t eol = bufferLengthAndSanityCheck_(sIOD, msgTooLong);
size_t eolSize = 0;
size_t eol = bufferLengthAndSanityCheck_(sIOD, msgTooLong, eolSize);
std::string cmdLine;
if (eol != std::string::npos) {
cmdLine = sIOD.readBuffer.substr(0, eol);
if (!cmdLine.empty() && *cmdLine.rbegin() == '\r')
cmdLine.erase(cmdLine.size() - 1);
sIOD.recvErrorCount = 0;
sIOD.readBuffer = sIOD.readBuffer.substr(eol + 1);
sIOD.readBuffer = sIOD.readBuffer.substr(eol + eolSize);
}
buffHasMoreCmds = ((sIOD.readBuffer.size() > MAXMSGLEN) ||
(sIOD.readBuffer.find('\n') != std::string::npos));
return cmdLine;
}

size_t Socket::bufferLengthAndSanityCheck_(SocketIOData &sIOD,
bool &msgTooLong) {
size_t Socket::bufferLengthAndSanityCheck_(SocketIOData &sIOD, bool &msgTooLong,
size_t &eolSize) {
std::string &rdBuffer = sIOD.readBuffer;
size_t eol = rdBuffer.find('\n');
size_t const eolMaxPos = MAXMSGLEN - 2;
size_t eolPos = rdBuffer.find('\n');

eolSize = 1;
if ((eolPos > 0) && (eolPos != std::string::npos) &&
(rdBuffer.at(eolPos - 1) == '\r')) {
eolPos -= 1;
eolSize += 1;
}

msgTooLong = false;
if (!sIOD.discardMode) {
if ((rdBuffer.length() < MAXMSGLEN) ||
(eol != std::string::npos && eol < MAXMSGLEN)) {
return eol;
((eolPos != std::string::npos) && (eolPos <= eolMaxPos))) {
return eolPos;
} else {
sIOD.discardMode = true;
msgTooLong = true;
}
}
// discard mode
if (++sIOD.recvErrorCount >= SOCKETERRORLIMIT) {
if (++sIOD.recvErrorCount >= SOCKETERRORLIMIT)
sIOD.closeFd = true;
return std::string::npos;
}
if (eol != std::string::npos) {
rdBuffer.erase(0, eol + 1);
else if (eolPos != std::string::npos) {
rdBuffer.erase(0, eolPos + eolSize);
sIOD.discardMode = false;
return std::string::npos;
}
if (!rdBuffer.empty() && '\r' == *rdBuffer.rbegin())
} else if (!rdBuffer.empty() && '\r' == *rdBuffer.rbegin())
rdBuffer = "\r";
else
rdBuffer.clear();
Expand Down
Loading