From: djm@openbsd.org <djm@openbsd.org>
Date: Fri, 9 May 2025 02:42:03 +0000 (+0000)
Subject: upstream: make the progress-meter code safe against being called
X-Git-Tag: V_10_1_P1~290
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17003b9f1cd7b7bf1f52493cc4a1ab95727c3ed7;p=thirdparty%2Fopenssh-portable.git

upstream: make the progress-meter code safe against being called

when not initialised; spotted by tb@ feedback/ok tb@ deraadt@

OpenBSD-Commit-ID: a9fda1ee08a24c62e0981ff6d15ca93b63467038
---

diff --git a/progressmeter.c b/progressmeter.c
index f1712da30..0d1faba39 100644
--- a/progressmeter.c
+++ b/progressmeter.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: progressmeter.c,v 1.54 2024/09/22 12:56:21 jsg Exp $ */
+/* $OpenBSD: progressmeter.c,v 1.55 2025/05/09 02:42:03 djm Exp $ */
 /*
  * Copyright (c) 2003 Nils Nordman.  All rights reserved.
  *
@@ -132,7 +132,8 @@ refresh_progress_meter(int force_update)
 	int hours, minutes, seconds;
 	int file_len, cols;
 
-	if ((!force_update && !alarm_fired && !win_resized) || !can_output())
+	if (file == NULL || (!force_update && !alarm_fired && !win_resized) ||
+	    !can_output())
 		return;
 	alarm_fired = 0;
 
@@ -276,6 +277,7 @@ stop_progress_meter(void)
 		refresh_progress_meter(1);
 
 	atomicio(vwrite, STDOUT_FILENO, "\n", 1);
+	file = NULL;
 }
 
 static void