diff options
author | deraadt@openbsd.org <deraadt@openbsd.org> | 2019-06-28 05:44:09 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-07-02 15:59:26 +1000 |
commit | e8c974043c1648eab0ad67a7ba6a3e444fe79d2d (patch) | |
tree | f3225ab6ddb116f732cb46571197e52c2f54f21c /auth2.c | |
parent | 1b2d55d15c6240c15a1e1cf4203b82e54a766272 (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
Diffstat (limited to 'auth2.c')
-rw-r--r-- | auth2.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth2.c,v 1.155 2019/03/25 22:34:52 djm Exp $ */ | 1 | /* $OpenBSD: auth2.c,v 1.156 2019/06/28 05:44:09 deraadt Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -717,7 +717,7 @@ auth2_record_info(Authctxt *authctxt, const char *fmt, ...) | |||
717 | i = vasprintf(&authctxt->auth_method_info, fmt, ap); | 717 | i = vasprintf(&authctxt->auth_method_info, fmt, ap); |
718 | va_end(ap); | 718 | va_end(ap); |
719 | 719 | ||
720 | if (i < 0 || authctxt->auth_method_info == NULL) | 720 | if (i == -1) |
721 | fatal("%s: vasprintf failed", __func__); | 721 | fatal("%s: vasprintf failed", __func__); |
722 | } | 722 | } |
723 | 723 | ||