From: deraadt@openbsd.org <deraadt@openbsd.org>
Date: Wed, 3 Jul 2019 03:24:02 +0000 (+0000)
Subject: upstream: snprintf/vsnprintf return < 0 on error, rather than -1.
X-Git-Tag: V_8_1_P1~191
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8142fcaf9ed8ff66252deecbfd29fc59d5f2df4f;p=thirdparty%2Fopenssh-portable.git

upstream: snprintf/vsnprintf return < 0 on error, rather than -1.

OpenBSD-Commit-ID: a261c421140a0639bb2b66bbceca72bf8239749d
---

diff --git a/moduli.c b/moduli.c
index 7120415fd..578fc485c 100644
--- a/moduli.c
+++ b/moduli.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: moduli.c,v 1.34 2019/01/23 09:49:00 dtucker Exp $ */
+/* $OpenBSD: moduli.c,v 1.35 2019/07/03 03:24:02 deraadt Exp $ */
 /*
  * Copyright 1994 Phil Karn <karn@qualcomm.com>
  * Copyright 1996-1998, 2003 William Allen Simpson <wsimpson@greendragon.com>
@@ -453,7 +453,7 @@ write_checkpoint(char *cpfile, u_int32_t lineno)
 	int r;
 
 	r = snprintf(tmp, sizeof(tmp), "%s.XXXXXXXXXX", cpfile);
-	if (r == -1 || r >= PATH_MAX) {
+	if (r < 0 || r >= PATH_MAX) {
 		logit("write_checkpoint: temp pathname too long");
 		return;
 	}