From: markus@openbsd.org <markus@openbsd.org>
Date: Fri, 6 Mar 2020 18:12:55 +0000 (+0000)
Subject: upstream: vasnmprintf allocates str and returns -1; ok djm
X-Git-Tag: V_8_3_P1~129
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6fb6f186cb62a6370fba476b6a03478a1e95c30d;p=thirdparty%2Fopenssh-portable.git

upstream: vasnmprintf allocates str and returns -1; ok djm

OpenBSD-Commit-ID: dae4c9e83d88471bf3b3f89e3da7a107b44df11c
---

diff --git a/utf8.c b/utf8.c
index db7cb8f35..b3d300478 100644
--- a/utf8.c
+++ b/utf8.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: utf8.c,v 1.8 2018/08/21 13:56:27 schwarze Exp $ */
+/* $OpenBSD: utf8.c,v 1.9 2020/03/06 18:12:55 markus Exp $ */
 /*
  * Copyright (c) 2016 Ingo Schwarze <schwarze@openbsd.org>
  *
@@ -241,7 +241,7 @@ int
 snmprintf(char *str, size_t sz, int *wp, const char *fmt, ...)
 {
 	va_list	 ap;
-	char	*cp;
+	char	*cp = NULL;
 	int	 ret;
 
 	va_start(ap, fmt);
@@ -263,11 +263,13 @@ snmprintf(char *str, size_t sz, int *wp, const char *fmt, ...)
 int
 vfmprintf(FILE *stream, const char *fmt, va_list ap)
 {
-	char	*str;
+	char	*str = NULL;
 	int	 ret;
 
-	if ((ret = vasnmprintf(&str, INT_MAX, NULL, fmt, ap)) < 0)
+	if ((ret = vasnmprintf(&str, INT_MAX, NULL, fmt, ap)) < 0) {
+		free(str);
 		return -1;
+	}
 	if (fputs(str, stream) == EOF)
 		ret = -1;
 	free(str);