Skip to content

Fixed parsing headers (HTTPConnection::readLine) #12

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

Open
pawel2000pl wants to merge 3 commits into
base: master
Choose a base branch
from
+24 −12
Open

Fixed parsing headers (HTTPConnection::readLine) #12

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7b10a07
Fixed an error in HTTPConnection::readLine when newChar == '\r' at th…
pawel2000pl Apr 11, 2026
cf7fd27
Created universal checking of \r\n
pawel2000pl Apr 11, 2026
ec51bf4
Fixed a typo
pawel2000pl Apr 11, 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
36 changes: 24 additions & 12 deletions src/HTTPConnection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,23 +284,35 @@ void HTTPConnection::raiseError(uint16_t code, std::string reason) {
}

void HTTPConnection::readLine(int lengthLimit) {
// Limit + CR size
_parserLine.text.reserve(lengthLimit+1);
while(_bufferProcessed < _bufferUnusedIdx) {
char newChar = _receiveBuffer[_bufferProcessed];

if (_parserLine.text.length() && _parserLine.text.back() == '\r') {
if (newChar != '\n') {
// Line has not been terminated by \r\n
HTTPS_LOGW("Line without \\r\\n (got only \\r). FID=%d", _socket);
raiseError(400, "Bad Request");
return;
}
_bufferProcessed += 1;
_parserLine.text.resize(_parserLine.text.length()-1);
_parserLine.parsingFinished = true;
return;
}

if ( newChar == '\r') {
// Look ahead for \n (if not possible, wait for next round
if (_bufferProcessed+1 < _bufferUnusedIdx) {
if (_receiveBuffer[_bufferProcessed+1] == '\n') {
_bufferProcessed += 2;
_parserLine.parsingFinished = true;
return;
} else {
// Line has not been terminated by \r\n
HTTPS_LOGW("Line without \\r\\n (got only \\r). FID=%d", _socket);
raiseError(400, "Bad Request");
return;
}
_parserLine.text += newChar;
_bufferProcessed += 1;
} else if (newChar < 32) {
if (newChar == '\n') {
HTTPS_LOGW("Line without \\r\\n (got only \\n). FID=%d", _socket);
} else {
HTTPS_LOGW("Recieved an invalid character (%d) in headers FID=%d", (int)newChar, _socket);
}
raiseError(400, "Bad Request");
return;
} else {
_parserLine.text += newChar;
_bufferProcessed += 1;
Expand Down