From: dtucker@openbsd.org <dtucker@openbsd.org>
Date: Fri, 3 Mar 2023 09:48:51 +0000 (+0000)
Subject: upstream: Check for non-NULL before string
X-Git-Tag: V_9_3_P1~38
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e44846a4487d2885ac7f2610be09b1e2bf52249b;p=thirdparty%2Fopenssh-portable.git

upstream: Check for non-NULL before string

comparison. From jjelen at redhat.com via bz#2687.

OpenBSD-Commit-ID: 0d9b2e0cac88a311b5766b1aef737082583c285f
---

diff --git a/clientloop.c b/clientloop.c
index b46fcdde7..1bdc7e61d 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.c,v 1.388 2023/03/03 02:37:58 dtucker Exp $ */
+/* $OpenBSD: clientloop.c,v 1.389 2023/03/03 09:48:51 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2112,7 +2112,7 @@ update_known_hosts(struct hostkeys_update_ctx *ctx)
 			free(response);
 			response = read_passphrase("Accept updated hostkeys? "
 			    "(yes/no): ", RP_ECHO);
-			if (strcasecmp(response, "yes") == 0)
+			if (response != NULL && strcasecmp(response, "yes") == 0)
 				break;
 			else if (quit_pending || response == NULL ||
 			    strcasecmp(response, "no") == 0) {