[openssh-commits] [openssh] 01/05: upstream: Null out keys after freeing in tests in the case where we
git+noreply at mindrot.org
git+noreply at mindrot.org
Tue Sep 30 08:26:23 AEST 2025
This is an automated email from the git hooks/post-receive script.
dtucker pushed a commit to branch master
in repository openssh.
commit c82f4dd6b723a8365b4c538d7c99fe8e46985ed0
Author: dtucker at openbsd.org <dtucker at openbsd.org>
AuthorDate: Mon Sep 29 07:40:55 2025 +0000
upstream: Null out keys after freeing in tests in the case where we
potentially reuse the variable. Fixes Coverity CID 405057.
OpenBSD-Regress-ID: c52e86502b33bfa6e448448a74a0217dd519dd58
---
regress/unittests/sshkey/test_sshkey.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/regress/unittests/sshkey/test_sshkey.c b/regress/unittests/sshkey/test_sshkey.c
index 5d5a6bec3..bfaa3f66d 100644
--- a/regress/unittests/sshkey/test_sshkey.c
+++ b/regress/unittests/sshkey/test_sshkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: test_sshkey.c,v 1.30 2025/05/24 06:50:28 dtucker Exp $ */
+/* $OpenBSD: test_sshkey.c,v 1.31 2025/09/29 07:40:55 dtucker Exp $ */
/*
* Regress test for sshkey.h key management API
*
@@ -258,6 +258,7 @@ sshkey_tests(void)
k1 = sshkey_new(KEY_UNSPEC);
ASSERT_PTR_NE(k1, NULL);
sshkey_free(k1);
+ k1 = NULL;
TEST_DONE();
#ifdef WITH_OPENSSL
@@ -266,6 +267,7 @@ sshkey_tests(void)
ASSERT_PTR_NE(k1, NULL);
ASSERT_PTR_NE(k1->pkey, NULL);
sshkey_free(k1);
+ k1 = NULL;
TEST_DONE();
@@ -275,6 +277,7 @@ sshkey_tests(void)
ASSERT_PTR_NE(k1, NULL);
ASSERT_PTR_EQ(k1->pkey, NULL); /* Can't allocate without NID */
sshkey_free(k1);
+ k1 = NULL;
TEST_DONE();
#endif
@@ -285,6 +288,7 @@ sshkey_tests(void)
ASSERT_PTR_EQ(k1->ed25519_sk, NULL);
ASSERT_PTR_EQ(k1->ed25519_pk, NULL);
sshkey_free(k1);
+ k1 = NULL;
TEST_DONE();
TEST_START("generate KEY_RSA too small modulus");
@@ -306,6 +310,7 @@ sshkey_tests(void)
SSH_ERR_KEY_LENGTH);
ASSERT_PTR_EQ(k1, NULL);
sshkey_free(k1);
+ k1 = NULL;
TEST_DONE();
#endif
--
To stop receiving notification emails like this one, please contact
djm at mindrot.org.
More information about the openssh-commits
mailing list