upstream: Some asprintf() calls were checked < 0, rather than the

precise == -1. ok millert nicm tb, etc

OpenBSD-Commit-ID: caecf8f57938685c04f125515b9f2806ad408d53

diff --git a/auth-options.c b/auth-options.c
index b05d6d6f3c8a8c26dd27e282614343f1c8a82113..4923a83b76e549ecdb62b20c74890f2e6fc41c1b 100644 (file)
--- a/auth-options.c
+++ b/auth-options.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth-options.c,v 1.84 2018/10/03 06:38:35 djm Exp $ */
+/* $OpenBSD: auth-options.c,v 1.85 2019/06/27 18:03:37 deraadt Exp $ */
 /*
  * Copyright (c) 2018 Damien Miller <djm@mindrot.org>
  *
@@ -332,7 +332,7 @@ handle_permit(const char **optsp, int allow_bare_port,
                 * Allow a bare port number in permitlisten to indicate a
                 * listen_host wildcard.
                 */
-               if (asprintf(&tmp, "*:%s", opt) < 0) {
+               if (asprintf(&tmp, "*:%s", opt) == -1) {
                        *errstrp = "memory allocation failed";
                        return -1;
                }

diff --git a/hostfile.c b/hostfile.c
index e1f826bddc9e27b13e12f939df55c48144294beb..eaa237c81895fdf672724551680baaeed1d5f027 100644 (file)
--- a/hostfile.c
+++ b/hostfile.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hostfile.c,v 1.73 2018/07/16 03:09:13 djm Exp $ */
+/* $OpenBSD: hostfile.c,v 1.74 2019/06/27 18:03:37 deraadt Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -545,8 +545,8 @@ hostfile_replace_entries(const char *filename, const char *host, const char *ip,
        /*
         * Prepare temporary file for in-place deletion.
         */
-       if ((r = asprintf(&temp, "%s.XXXXXXXXXXX", filename)) < 0 ||
-           (r = asprintf(&back, "%s.old", filename)) < 0) {
+       if ((r = asprintf(&temp, "%s.XXXXXXXXXXX", filename)) = -1 ||
+           (r = asprintf(&back, "%s.old", filename)) == -1) {
                r = SSH_ERR_ALLOC_FAIL;
                goto fail;
        }

diff --git a/misc.c b/misc.c
index 009e02bc55c11d500c22f78066ee46748f574d57..4011ee5f269311ed594b53fe5fee9302b6cdf1d0 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.137 2019/01/23 21:50:56 dtucker Exp $ */
+/* $OpenBSD: misc.c,v 1.138 2019/06/27 18:03:37 deraadt Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  * Copyright (c) 2005,2006 Damien Miller.  All rights reserved.
@@ -550,7 +550,7 @@ put_host_port(const char *host, u_short port)
 
        if (port == 0 || port == SSH_DEFAULT_PORT)
                return(xstrdup(host));
-       if (asprintf(&hoststr, "[%s]:%d", host, (int)port) < 0)
+       if (asprintf(&hoststr, "[%s]:%d", host, (int)port) == -1)
                fatal("put_host_port: asprintf: %s", strerror(errno));
        debug3("put_host_port: %s", hoststr);
        return hoststr;

diff --git a/sshkey-xmss.c b/sshkey-xmss.c
index aaae7028928c43ec673b160bb70cf93bda4d6cd7..ef39831c6bf03d58362b68dfe9e4ac4e2509de5a 100644 (file)
--- a/sshkey-xmss.c
+++ b/sshkey-xmss.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshkey-xmss.c,v 1.3 2018/07/09 21:59:10 markus Exp $ */
+/* $OpenBSD: sshkey-xmss.c,v 1.4 2019/06/27 18:03:37 deraadt Exp $ */
 /*
  * Copyright (c) 2017 Markus Friedl.  All rights reserved.
  *
@@ -467,9 +467,9 @@ sshkey_xmss_get_state(const struct sshkey *k, sshkey_printfn *pr)
        }
        if ((filename = k->xmss_filename) == NULL)
                goto done;
-       if (asprintf(&lockfile, "%s.lock", filename) < 0 ||
-           asprintf(&statefile, "%s.state", filename) < 0 ||
-           asprintf(&ostatefile, "%s.ostate", filename) < 0) {
+       if (asprintf(&lockfile, "%s.lock", filename) == -1 ||
+           asprintf(&statefile, "%s.state", filename) == -1 ||
+           asprintf(&ostatefile, "%s.ostate", filename) == -1) {
                ret = SSH_ERR_ALLOC_FAIL;
                goto done;
        }
@@ -594,9 +594,9 @@ sshkey_xmss_update_state(const struct sshkey *k, sshkey_printfn *pr)
        state->idx = idx;
        if ((filename = k->xmss_filename) == NULL)
                goto done;
-       if (asprintf(&statefile, "%s.state", filename) < 0 ||
-           asprintf(&ostatefile, "%s.ostate", filename) < 0 ||
-           asprintf(&nstatefile, "%s.nstate", filename) < 0) {
+       if (asprintf(&statefile, "%s.state", filename) == -1 ||
+           asprintf(&ostatefile, "%s.ostate", filename) == -1 ||
+           asprintf(&nstatefile, "%s.nstate", filename) == -1) {
                ret = SSH_ERR_ALLOC_FAIL;
                goto done;
        }