From 0178975340a5739cb09e348b91fa7557df46ac8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 21 Mar 2025 15:43:58 +0100 Subject: [PATCH 1/4] libstore/local-store: fix linting warning about unused variable (cherry picked from commit 05082ea1c5b6cb1cc1a6bfc50f9d9c81052cbfe8) --- src/libstore/local-store.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc index 1ac3f3978..f1cf3ee03 100644 --- a/src/libstore/local-store.cc +++ b/src/libstore/local-store.cc @@ -248,7 +248,7 @@ LocalStore::LocalStore( else if (curSchema == 0) { /* new store */ curSchema = nixSchemaVersion; openDB(*state, true); - writeFile(schemaPath, fmt("%1%", nixSchemaVersion), 0666, true); + writeFile(schemaPath, fmt("%1%", curSchema), 0666, true); } else if (curSchema < nixSchemaVersion) { From ab7a1df6ed49f461af43b5a56dcd3a7cfb89006c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 21 Mar 2025 15:43:39 +0100 Subject: [PATCH 2/4] git/getStringUntil: fix uninitialized stack variable at least clang-tidy is not convinced that this initialized. If this is not the case, the impact should be small and hopefully also more robust if changed. (cherry picked from commit 7e540059a33536517a508ffef323f6c88c61fad6) --- src/libutil/git.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libutil/git.cc b/src/libutil/git.cc index 3303dbc32..a3be66429 100644 --- a/src/libutil/git.cc +++ b/src/libutil/git.cc @@ -33,7 +33,7 @@ std::optional decodeMode(RawMode m) { static std::string getStringUntil(Source & source, char byte) { std::string s; - char n[1]; + char n[1] = { 0 }; source(std::string_view { n, 1 }); while (*n != byte) { s += *n; From 11e7d82fc8a6d142bba4929eb6238ab740d76408 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 21 Mar 2025 11:21:27 +0100 Subject: [PATCH 3/4] test/ca-fd-leak: fix clang-tidy lints (cherry picked from commit b050db951be9b94e1cce0341300bdae5ee4397a3) --- tests/nixos/ca-fd-leak/sender.c | 2 +- tests/nixos/ca-fd-leak/smuggler.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/nixos/ca-fd-leak/sender.c b/tests/nixos/ca-fd-leak/sender.c index 8356b2479..2ec79947a 100644 --- a/tests/nixos/ca-fd-leak/sender.c +++ b/tests/nixos/ca-fd-leak/sender.c @@ -19,7 +19,7 @@ int main(int argc, char **argv) { struct sockaddr_un data; data.sun_family = AF_UNIX; data.sun_path[0] = 0; - strcpy(data.sun_path + 1, argv[1]); + strncpy(data.sun_path + 1, argv[1], sizeof(data.sun_path) - 2); // Now try to connect, To ensure we work no matter what order we are // executed in, just busyloop here. diff --git a/tests/nixos/ca-fd-leak/smuggler.c b/tests/nixos/ca-fd-leak/smuggler.c index 3f89af5bb..7279c48bf 100644 --- a/tests/nixos/ca-fd-leak/smuggler.c +++ b/tests/nixos/ca-fd-leak/smuggler.c @@ -5,6 +5,7 @@ #include #include #include +#include int main(int argc, char **argv) { From c4e5df400d94909f49075addd9ce5c34bf05d514 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 21 Mar 2025 11:11:27 +0100 Subject: [PATCH 4/4] libstore/daemon: make sure monitor is not considered "unused" (cherry picked from commit 5c3682d7a11658dddd242ea1c9be70f0e0cc7ff6) --- src/libstore/daemon.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libstore/daemon.cc b/src/libstore/daemon.cc index b921dbe2d..8bcdad4df 100644 --- a/src/libstore/daemon.cc +++ b/src/libstore/daemon.cc @@ -1025,6 +1025,7 @@ void processConnection( { #ifndef _WIN32 // TODO need graceful async exit support on Windows? auto monitor = !recursive ? std::make_unique(from.fd) : nullptr; + (void) monitor; // suppress warning #endif /* Exchange the greeting. */