[openssh-commits] [openssh] 03/03: upstream: Set user, host and path to NULL immediately before calling

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

dtucker pushed a commit to branch master
in repository openssh.

commit 930a45ee759728c8ba711c45a2a985b8191bd297
Author: dtucker at openbsd.org <dtucker at openbsd.org>
AuthorDate: Thu Jun 12 10:09:39 2025 +0000

    upstream: Set user, host and path to NULL immediately before calling
    
    parse_user_host_path in tests.  This ensures that we don't accidentally use
    the previous value if the function under test doesn't set them Also fixes
    Coverity CIDs 405056 405065 405066.
    
    OpenBSD-Regress-ID: 43678ff59001712f32214fe303b1c21c163c2960
---
 regress/unittests/misc/test_parse.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/regress/unittests/misc/test_parse.c b/regress/unittests/misc/test_parse.c
index 1f1ea31d1..c66028aec 100644
--- a/regress/unittests/misc/test_parse.c
+++ b/regress/unittests/misc/test_parse.c
@@ -1,4 +1,4 @@
-/* 	$OpenBSD: test_parse.c,v 1.2 2021/12/14 21:25:27 deraadt Exp $ */
+/* 	$OpenBSD: test_parse.c,v 1.3 2025/06/12 10:09:39 dtucker Exp $ */
 /*
  * Regress test for misc user/host/URI parsing functions.
  *
@@ -29,6 +29,7 @@ test_parse(void)
 	char *user, *host, *path;
 
 	TEST_START("misc_parse_user_host_path");
+	user = host = path = NULL;
 	ASSERT_INT_EQ(parse_user_host_path("someuser at some.host:some/path",
 	    &user, &host, &path), 0);
 	ASSERT_STRING_EQ(user, "someuser");
@@ -38,6 +39,7 @@ test_parse(void)
 	TEST_DONE();
 
 	TEST_START("misc_parse_user_ipv4_path");
+	user = host = path = NULL;
 	ASSERT_INT_EQ(parse_user_host_path("someuser at 1.22.33.144:some/path",
 	    &user, &host, &path), 0);
 	ASSERT_STRING_EQ(user, "someuser");
@@ -47,6 +49,7 @@ test_parse(void)
 	TEST_DONE();
 
 	TEST_START("misc_parse_user_[ipv4]_path");
+	user = host = path = NULL;
 	ASSERT_INT_EQ(parse_user_host_path("someuser@[1.22.33.144]:some/path",
 	    &user, &host, &path), 0);
 	ASSERT_STRING_EQ(user, "someuser");
@@ -56,6 +59,7 @@ test_parse(void)
 	TEST_DONE();
 
 	TEST_START("misc_parse_user_[ipv4]_nopath");
+	user = host = path = NULL;
 	ASSERT_INT_EQ(parse_user_host_path("someuser@[1.22.33.144]:",
 	    &user, &host, &path), 0);
 	ASSERT_STRING_EQ(user, "someuser");
@@ -65,6 +69,7 @@ test_parse(void)
 	TEST_DONE();
 
 	TEST_START("misc_parse_user_ipv6_path");
+	user = host = path = NULL;
 	ASSERT_INT_EQ(parse_user_host_path("someuser@[::1]:some/path",
 	    &user, &host, &path), 0);
 	ASSERT_STRING_EQ(user, "someuser");
@@ -74,6 +79,7 @@ test_parse(void)
 	TEST_DONE();
 
 	TEST_START("misc_parse_uri");
+	user = host = path = NULL;
 	ASSERT_INT_EQ(parse_uri("ssh", "ssh://someuser@some.host:22/some/path",
 	    &user, &host, &port, &path), 0);
 	ASSERT_STRING_EQ(user, "someuser");

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.