From: djm@openbsd.org <djm@openbsd.org>
Date: Fri, 19 Dec 2025 01:26:39 +0000 (+0000)
Subject: upstream: correctly check subsystem command is not the empty string
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b98be75dbb2ccb1c3146429c0077416c113b57d;p=thirdparty%2Fopenssh-portable.git

upstream: correctly check subsystem command is not the empty string

(was repeatedly checking the subsystem name) spotted by Coverity (CID 898836)

OpenBSD-Commit-ID: dabea2b499de8280f76f7291dd52086df6831cb0
---

diff --git a/servconf.c b/servconf.c
index 3452e1a30..94184b5b4 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: servconf.c,v 1.442 2025/12/19 00:56:34 djm Exp $ */
+/* $OpenBSD: servconf.c,v 1.443 2025/12/19 01:26:39 djm Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -1959,7 +1959,7 @@ process_server_config_line_depth(ServerOptions *options, char *line,
 
 	case sSubsystem:
 		if ((arg = argv_next(&ac, &av)) == NULL || *arg == '\0' ||
-		   ((arg2 = argv_next(&ac, &av)) == NULL || *arg == '\0'))
+		   ((arg2 = argv_next(&ac, &av)) == NULL || *arg2 == '\0'))
 			fatal("%s line %d: %s missing argument.",
 			    filename, linenum, keyword);
 		if (!*activep) {