wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-07 22:33:57 +02:00
Code Activity

Merge pull request #12190 from NixOS/mergify/bp/2.24-maintenance/pr-11813

Browse source 
fix(libstore-tests): remove use-after-free bug for `StringSource` (backport #11813)
This commit is contained in:
mergify[bot] 2025-01-10 19:34:56 +00:00 • committed by GitHub
commit 51e41edbef
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 16 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/libutil/serialise.hh
View file

@ -2,6 +2,7 @@
///@file ///@file
#include <memory> #include <memory>
#include <type_traits>
#include "types.hh" #include "types.hh"
#include "util.hh" #include "util.hh"
@ -192,7 +193,14 @@ struct StringSource : Source
{ {
std::string_view s; std::string_view s;
size_t pos; size_t pos;
// NOTE: Prevent unintentional dangling views when an implicit conversion
// from std::string -> std::string_view occurs when the string is passed
// by rvalue.
StringSource(std::string &&) = delete;
StringSource(std::string_view s) : s(s), pos(0) { } StringSource(std::string_view s) : s(s), pos(0) { }
StringSource(const std::string& str): StringSource(std::string_view(str)) {}
size_t read(char * data, size_t len) override; size_t read(char * data, size_t len) override;
}; };

15
tests/unit/libstore/serve-protocol.cc
View file

@ -459,21 +459,14 @@ TEST_F(ServeProtoTest, handshake_client_truncated_replay_throws)
CharacterizationTest::readTest("handshake-to-client", [&](std::string toClientLog) { CharacterizationTest::readTest("handshake-to-client", [&](std::string toClientLog) {
for (size_t len = 0; len < toClientLog.size(); ++len) { for (size_t len = 0; len < toClientLog.size(); ++len) {
NullBufferedSink nullSink; NullBufferedSink nullSink;
StringSource in { auto substring = toClientLog.substr(0, len);
// truncate StringSource in{substring};
toClientLog.substr(0, len)
};
if (len < 8) { if (len < 8) {
EXPECT_THROW( EXPECT_THROW(
ServeProto::BasicClientConnection::handshake( ServeProto::BasicClientConnection::handshake(nullSink, in, defaultVersion, "blah"), EndOfFile);
nullSink, in, defaultVersion, "blah"),
EndOfFile);
} else { } else {
// Not sure why cannot keep on checking for `EndOfFile`. // Not sure why cannot keep on checking for `EndOfFile`.
EXPECT_THROW( EXPECT_THROW(ServeProto::BasicClientConnection::handshake(nullSink, in, defaultVersion, "blah"), Error);
ServeProto::BasicClientConnection::handshake(
nullSink, in, defaultVersion, "blah"),
Error);
} }
} }
}); });

15
tests/unit/libstore/worker-protocol.cc
View file

@ -725,21 +725,14 @@ TEST_F(WorkerProtoTest, handshake_client_truncated_replay_throws)
CharacterizationTest::readTest("handshake-to-client", [&](std::string toClientLog) { CharacterizationTest::readTest("handshake-to-client", [&](std::string toClientLog) {
for (size_t len = 0; len < toClientLog.size(); ++len) { for (size_t len = 0; len < toClientLog.size(); ++len) {
NullBufferedSink nullSink; NullBufferedSink nullSink;
StringSource in { auto substring = toClientLog.substr(0, len);
// truncate StringSource in{substring};
toClientLog.substr(0, len)
};
if (len < 8) { if (len < 8) {
EXPECT_THROW( EXPECT_THROW(
WorkerProto::BasicClientConnection::handshake( WorkerProto::BasicClientConnection::handshake(nullSink, in, defaultVersion, {}), EndOfFile);
nullSink, in, defaultVersion, {}),
EndOfFile);
} else { } else {
// Not sure why cannot keep on checking for `EndOfFile`. // Not sure why cannot keep on checking for `EndOfFile`.
EXPECT_THROW( EXPECT_THROW(WorkerProto::BasicClientConnection::handshake(nullSink, in, defaultVersion, {}), Error);
WorkerProto::BasicClientConnection::handshake(
nullSink, in, defaultVersion, {}),
Error);
} }
} }
}); });