ded/cpp-httplib
1
0
Fork 0
mirror of https://github.com/yhirose/cpp-httplib.git synced 2026-11-06 09:25:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cap a send() or wolfSSL_read() length at INT_MAX (#2655)

Browse Source 
* Cap a send() or wolfSSL_read() length at INT_MAX

On 64-bit Windows SocketStream::write() handed size to send(), whose
length is an int, so a single write of 4 GiB or more went out as its low
32 bits: a 4 GiB + 1 byte write sent one byte, and write_data() then
retried the remaining 4 GiB as zero-byte sends forever. The INT_MAX cap
that read() has was limited to 32-bit Windows in df20c27 (#1294), when
the body was still written with one unchecked write(); write_data() now
sends the rest, so the cap applies to every Windows build again.

The wolfSSL tls::read() had the same cast, so a read into a buffer over
INT_MAX failed. Cap it as the OpenSSL backend has done since f80864c.

* Drop the 4 GiB write test and shorten comments

The Windows-only test allocated 4 GiB and took about 5 s, which is too
heavy for CI.

---------

Co-authored-by: yhirose <yuji.hirose.bug@gmail.com>
This commit is contained in:
Wei-Lun Li
2026-11-05 08:06:30 +09:00
committed by GitHub
parent 453b1b8613
commit a1ba73a256
2 changed files with 48 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
test/test.cc
View File

@@ -25056,6 +25056,49 @@ TEST(SSLTest, ResponseBodyTerminatedByConnectionClose) {
EXPECT_EQ(StatusCode::OK_200, res->status);
EXPECT_EQ(expected_body, res->body);
}
// Without Content-Length, the full buffer size reaches tls::read().
TEST(SSLTest, ReadIntoBufferOverIntMax) {
if (sizeof(size_t) <= sizeof(int)) {
GTEST_SKIP() << "size_t cannot exceed INT_MAX here";
}
SSLServer svr(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE);
ASSERT_TRUE(svr.is_valid());
svr.Get("/no-content-length", [&](const Request & /*req*/, Response &res) {
res.set_content_provider("text/plain",
[&](size_t offset, DataSink &sink) -> bool {
if (offset == 0) { sink.write("Hello", 5); }
sink.done();
return true;
});
});
auto port = svr.bind_to_any_port(HOST);
auto listen_thread = std::thread([&svr] { svr.listen_after_bind(); });
auto se = detail::scope_exit([&] {
svr.stop();
listen_thread.join();
});
svr.wait_until_ready();
SSLClient cli(HOST, port);
cli.enable_server_certificate_verification(false);
auto handle = cli.open_stream("GET", "/no-content-length");
ASSERT_TRUE(handle.is_valid()) << to_string(handle.error);
const auto len = static_cast<size_t>((std::numeric_limits<int>::max)()) + 1;
std::unique_ptr<char[]> buf(new char[len]);
std::string body;
ssize_t n;
while ((n = handle.read(buf.get(), len)) > 0) {
body.append(buf.get(), static_cast<size_t>(n));
}
EXPECT_EQ(0, n);
EXPECT_EQ("Hello", body);
}
#endif // CPPHTTPLIB_SSL_ENABLED
//==============================================================================