eden-emu/cpp-httplib
14
0
Fork 0
mirror of https://github.com/yhirose/cpp-httplib.git synced 2025-05-15 01:08:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix #1908 (#1910)

Browse source 
* Fix #1908

* Code format
This commit is contained in:
yhirose 2024-09-03 00:47:39 -04:00 • committed by GitHub
parent c5ee208775
commit b1f8e986bf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 61 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

29
httplib.h
View file

@ -2790,6 +2790,10 @@ inline bool stream_line_reader::getline() {
fixed_buffer_used_size_ = 0;
glowable_buffer_.clear();
#ifndef CPPHTTPLIB_ALLOW_LF_AS_LINE_TERMINATOR
char prev_byte = 0;
#endif
for (size_t i = 0;; i++) {
char byte;
auto n = strm_.read(&byte, 1);
@ -2806,7 +2810,12 @@ inline bool stream_line_reader::getline() {
append(byte);
#ifdef CPPHTTPLIB_ALLOW_LF_AS_LINE_TERMINATOR
if (byte == '\n') { break; }
#else
if (prev_byte == '\r' && byte == '\n') { break; }
prev_byte = byte;
#endif
}
return true;
@ -2862,7 +2871,8 @@ inline bool mmap::open(const char *path) {
// If the following line doesn't compile due to QuadPart, update Windows SDK.
// See:
// https://github.com/yhirose/cpp-httplib/issues/1903#issuecomment-2316520721
if (static_cast<ULONGLONG>(size.QuadPart) > std::numeric_limits<decltype(size_)>::max()) {
if (static_cast<ULONGLONG>(size.QuadPart) >
std::numeric_limits<decltype(size_)>::max()) {
// `size_t` might be 32-bits, on 32-bits Windows.
return false;
}
@ -4049,7 +4059,22 @@ inline bool read_headers(Stream &strm, Headers &headers) {
auto end = line_reader.ptr() + line_reader.size() - line_terminator_len;
parse_header(line_reader.ptr(), end,
[&](const std::string &key, const std::string &val) {
[&](const std::string &key, std::string &val) {
// NOTE: From RFC 9110:
// Field values containing CR, LF, or NUL characters are
// invalid and dangerous, due to the varying ways that
// implementations might parse and interpret those
// characters; a recipient of CR, LF, or NUL within a field
// value MUST either reject the message or replace each of
// those characters with SP before further processing or
// forwarding of that message.
for (auto &c : val) {
switch (c) {
case '\0':
case '\n':
case '\r': c = ' '; break;
}
}
headers.emplace(key, val);
});
}