summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorderaadt@openbsd.org <deraadt@openbsd.org>2019-06-28 05:44:09 +0000
committerDamien Miller <djm@mindrot.org>2019-07-02 15:59:26 +1000
commite8c974043c1648eab0ad67a7ba6a3e444fe79d2d (patch)
treef3225ab6ddb116f732cb46571197e52c2f54f21c
parent1b2d55d15c6240c15a1e1cf4203b82e54a766272 (diff)
upstream: asprintf returns -1, not an arbitrary value < 0. Also
upon error the (very sloppy specification) leaves an undefined value in *ret, so it is wrong to inspect it, the error condition is enough. discussed a little with nicm, and then much more with millert until we were exasperated OpenBSD-Commit-ID: 29258fa51edf8115d244b9d4b84028487bf8923e
-rw-r--r--auth2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/auth2.c b/auth2.c
index 16ae1a36..9b08757a 100644
--- a/auth2.c
+++ b/auth2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2.c,v 1.155 2019/03/25 22:34:52 djm Exp $ */
+/* $OpenBSD: auth2.c,v 1.156 2019/06/28 05:44:09 deraadt Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
*
@@ -717,7 +717,7 @@ auth2_record_info(Authctxt *authctxt, const char *fmt, ...)
i = vasprintf(&authctxt->auth_method_info, fmt, ap);
va_end(ap);
- if (i < 0 || authctxt->auth_method_info == NULL)
+ if (i == -1)
fatal("%s: vasprintf failed", __func__);
}