rename xrealloc() to xreallocarray() since it follows that form.

ok djm

diff --git a/usr.bin/ssh/channels.c b/usr.bin/ssh/channels.c
index 2fc9969..5205da9 100644 (file)
--- a/usr.bin/ssh/channels.c
+++ b/usr.bin/ssh/channels.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.c,v 1.341 2015/02/06 23:21:59 millert Exp $ */
+/* $OpenBSD: channels.c,v 1.342 2015/04/24 01:36:00 deraadt Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -296,7 +296,7 @@ channel_new(char *ctype, int type, int rfd, int wfd, int efd,
                if (channels_alloc > 10000)
                        fatal("channel_new: internal error: channels_alloc %d "
                            "too big.", channels_alloc);
-               channels = xrealloc(channels, channels_alloc + 10,
+               channels = xreallocarray(channels, channels_alloc + 10,
                    sizeof(Channel *));
                channels_alloc += 10;
                debug2("channel: expanding %d", channels_alloc);
@@ -2165,8 +2165,8 @@ channel_prepare_select(fd_set **readsetp, fd_set **writesetp, int *maxfdp,
 
        /* perhaps check sz < nalloc/2 and shrink? */
        if (*readsetp == NULL || sz > *nallocp) {
-               *readsetp = xrealloc(*readsetp, nfdset, sizeof(fd_mask));
-               *writesetp = xrealloc(*writesetp, nfdset, sizeof(fd_mask));
+               *readsetp = xreallocarray(*readsetp, nfdset, sizeof(fd_mask));
+               *writesetp = xreallocarray(*writesetp, nfdset, sizeof(fd_mask));
                *nallocp = sz;
        }
        *maxfdp = n;
@@ -3204,7 +3204,7 @@ channel_request_remote_forwarding(struct Forward *fwd)
        }
        if (success) {
                /* Record that connection to this host/port is permitted. */
-               permitted_opens = xrealloc(permitted_opens,
+               permitted_opens = xreallocarray(permitted_opens,
                    num_permitted_opens + 1, sizeof(*permitted_opens));
                idx = num_permitted_opens++;
                if (fwd->connect_path != NULL) {
@@ -3433,7 +3433,7 @@ channel_add_permitted_opens(char *host, int port)
 {
        debug("allow port forwarding to host %s port %d", host, port);
 
-       permitted_opens = xrealloc(permitted_opens,
+       permitted_opens = xreallocarray(permitted_opens,
            num_permitted_opens + 1, sizeof(*permitted_opens));
        permitted_opens[num_permitted_opens].host_to_connect = xstrdup(host);
        permitted_opens[num_permitted_opens].port_to_connect = port;
@@ -3483,7 +3483,7 @@ channel_add_adm_permitted_opens(char *host, int port)
 {
        debug("config allows port forwarding to host %s port %d", host, port);
 
-       permitted_adm_opens = xrealloc(permitted_adm_opens,
+       permitted_adm_opens = xreallocarray(permitted_adm_opens,
            num_adm_permitted_opens + 1, sizeof(*permitted_adm_opens));
        permitted_adm_opens[num_adm_permitted_opens].host_to_connect
             = xstrdup(host);

diff --git a/usr.bin/ssh/misc.c b/usr.bin/ssh/misc.c
index 6110a6f..19b3b45 100644 (file)
--- a/usr.bin/ssh/misc.c
+++ b/usr.bin/ssh/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.96 2015/01/16 06:40:12 deraadt Exp $ */
+/* $OpenBSD: misc.c,v 1.97 2015/04/24 01:36:00 deraadt Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  * Copyright (c) 2005,2006 Damien Miller.  All rights reserved.
@@ -455,7 +455,7 @@ addargs(arglist *args, char *fmt, ...)
        } else if (args->num+2 >= nalloc)
                nalloc *= 2;
 
-       args->list = xrealloc(args->list, nalloc, sizeof(char *));
+       args->list = xreallocarray(args->list, nalloc, sizeof(char *));
        args->nalloc = nalloc;
        args->list[args->num++] = cp;
        args->list[args->num] = NULL;

diff --git a/usr.bin/ssh/mux.c b/usr.bin/ssh/mux.c
index 108270a..73d6597 100644 (file)
--- a/usr.bin/ssh/mux.c
+++ b/usr.bin/ssh/mux.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mux.c,v 1.50 2015/01/20 23:14:00 deraadt Exp $ */
+/* $OpenBSD: mux.c,v 1.51 2015/04/24 01:36:00 deraadt Exp $ */
 /*
  * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org>
  *
@@ -337,7 +337,7 @@ process_mux_new_session(u_int rid, Channel *c, Buffer *m, Buffer *r)
                        free(cp);
                        continue;
                }
-               cctx->env = xrealloc(cctx->env, env_len + 2,
+               cctx->env = xreallocarray(cctx->env, env_len + 2,
                    sizeof(*cctx->env));
                cctx->env[env_len++] = cp;
                cctx->env[env_len] = NULL;

diff --git a/usr.bin/ssh/readconf.c b/usr.bin/ssh/readconf.c
index 0b314dd..e47b9bb 100644 (file)
--- a/usr.bin/ssh/readconf.c
+++ b/usr.bin/ssh/readconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.c,v 1.233 2015/03/30 00:00:29 djm Exp $ */
+/* $OpenBSD: readconf.c,v 1.234 2015/04/24 01:36:00 deraadt Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -283,7 +283,7 @@ add_local_forward(Options *options, const struct Forward *newfwd)
        if (newfwd->listen_port < IPPORT_RESERVED && original_real_uid != 0 &&
            newfwd->listen_path == NULL)
                fatal("Privileged ports can only be forwarded by root.");
-       options->local_forwards = xrealloc(options->local_forwards,
+       options->local_forwards = xreallocarray(options->local_forwards,
            options->num_local_forwards + 1,
            sizeof(*options->local_forwards));
        fwd = &options->local_forwards[options->num_local_forwards++];
@@ -306,7 +306,7 @@ add_remote_forward(Options *options, const struct Forward *newfwd)
 {
        struct Forward *fwd;
 
-       options->remote_forwards = xrealloc(options->remote_forwards,
+       options->remote_forwards = xreallocarray(options->remote_forwards,
            options->num_remote_forwards + 1,
            sizeof(*options->remote_forwards));
        fwd = &options->remote_forwards[options->num_remote_forwards++];

diff --git a/usr.bin/ssh/scp.c b/usr.bin/ssh/scp.c
index 52d02eb..e15a69c 100644 (file)
--- a/usr.bin/ssh/scp.c
+++ b/usr.bin/ssh/scp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scp.c,v 1.181 2015/01/16 06:40:12 deraadt Exp $ */
+/* $OpenBSD: scp.c,v 1.182 2015/04/24 01:36:00 deraadt Exp $ */
 /*
  * scp - secure remote copy.  This is basically patched BSD rcp which
  * uses ssh to do the data transfer (instead of using rcmd).
@@ -1300,7 +1300,7 @@ allocbuf(BUF *bp, int fd, int blksize)
        if (bp->buf == NULL)
                bp->buf = xmalloc(size);
        else
-               bp->buf = xrealloc(bp->buf, 1, size);
+               bp->buf = xreallocarray(bp->buf, 1, size);
        memset(bp->buf, 0, size);
        bp->cnt = size;
        return (bp);

diff --git a/usr.bin/ssh/servconf.c b/usr.bin/ssh/servconf.c
index 0b7b4db..cdafc0f 100644 (file)
--- a/usr.bin/ssh/servconf.c
+++ b/usr.bin/ssh/servconf.c
@@ -1,5 +1,5 @@
 
-/* $OpenBSD: servconf.c,v 1.263 2015/04/23 04:59:10 dtucker Exp $ */
+/* $OpenBSD: servconf.c,v 1.264 2015/04/24 01:36:00 deraadt Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -1396,7 +1396,7 @@ process_server_config_line(ServerOptions *options, char *line,
                len = strlen(p) + 1;
                while ((arg = strdelim(&cp)) != NULL && *arg != '\0') {
                        len += 1 + strlen(arg);
-                       p = xrealloc(p, 1, len);
+                       p = xreallocarray(p, 1, len);
                        strlcat(p, " ", len);
                        strlcat(p, arg, len);
                }

diff --git a/usr.bin/ssh/session.c b/usr.bin/ssh/session.c
index aa7ae45..26e6a1a 100644 (file)
--- a/usr.bin/ssh/session.c
+++ b/usr.bin/ssh/session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: session.c,v 1.277 2015/01/16 06:40:12 deraadt Exp $ */
+/* $OpenBSD: session.c,v 1.278 2015/04/24 01:36:00 deraadt Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -879,7 +879,7 @@ child_set_env(char ***envp, u_int *envsizep, const char *name,
                        if (envsize >= 1000)
                                fatal("child_set_env: too many env vars");
                        envsize += 50;
-                       env = (*envp) = xrealloc(env, envsize, sizeof(char *));
+                       env = (*envp) = xreallocarray(env, envsize, sizeof(char *));
                        *envsizep = envsize;
                }
                /* Need to set the NULL pointer at end of array beyond the new slot. */
@@ -1533,7 +1533,7 @@ session_new(void)
                        return NULL;
                debug2("%s: allocate (allocated %d max %d)",
                    __func__, sessions_nalloc, options.max_sessions);
-               tmp = xrealloc(sessions, sessions_nalloc + 1,
+               tmp = xreallocarray(sessions, sessions_nalloc + 1,
                    sizeof(*sessions));
                if (tmp == NULL) {
                        error("%s: cannot allocate %d sessions",
@@ -1860,7 +1860,7 @@ session_env_req(Session *s)
        for (i = 0; i < options.num_accept_env; i++) {
                if (match_pattern(name, options.accept_env[i])) {
                        debug2("Setting env %d: %s=%s", s->num_env, name, val);
-                       s->env = xrealloc(s->env, s->num_env + 1,
+                       s->env = xreallocarray(s->env, s->num_env + 1,
                            sizeof(*s->env));
                        s->env[s->num_env].name = name;
                        s->env[s->num_env].val = val;

diff --git a/usr.bin/ssh/sftp-client.c b/usr.bin/ssh/sftp-client.c
index 6efc7e9..8f03236 100644 (file)
--- a/usr.bin/ssh/sftp-client.c
+++ b/usr.bin/ssh/sftp-client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-client.c,v 1.117 2015/01/20 23:14:00 deraadt Exp $ */
+/* $OpenBSD: sftp-client.c,v 1.118 2015/04/24 01:36:00 deraadt Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
  *
@@ -614,7 +614,7 @@ do_lsreaddir(struct sftp_conn *conn, const char *path, int print_flag,
                                error("Server sent suspect path \"%s\" "
                                    "during readdir of \"%s\"", filename, path);
                        } else if (dir) {
-                               *dir = xrealloc(*dir, ents + 2, sizeof(**dir));
+                               *dir = xreallocarray(*dir, ents + 2, sizeof(**dir));
                                (*dir)[ents] = xcalloc(1, sizeof(***dir));
                                (*dir)[ents]->filename = xstrdup(filename);
                                (*dir)[ents]->longname = xstrdup(longname);

diff --git a/usr.bin/ssh/sftp-server.c b/usr.bin/ssh/sftp-server.c
index 2e7cdd3..075e7b2 100644 (file)
--- a/usr.bin/ssh/sftp-server.c
+++ b/usr.bin/ssh/sftp-server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-server.c,v 1.105 2015/01/20 23:14:00 deraadt Exp $ */
+/* $OpenBSD: sftp-server.c,v 1.106 2015/04/24 01:36:01 deraadt Exp $ */
 /*
  * Copyright (c) 2000-2004 Markus Friedl.  All rights reserved.
  *
@@ -298,7 +298,7 @@ handle_new(int use, const char *name, int fd, int flags, DIR *dirp)
                if (num_handles + 1 <= num_handles)
                        return -1;
                num_handles++;
-               handles = xrealloc(handles, num_handles, sizeof(Handle));
+               handles = xreallocarray(handles, num_handles, sizeof(Handle));
                handle_unused(num_handles - 1);
        }
 
@@ -1039,7 +1039,7 @@ process_readdir(u_int32_t id)
                while ((dp = readdir(dirp)) != NULL) {
                        if (count >= nstats) {
                                nstats *= 2;
-                               stats = xrealloc(stats, nstats, sizeof(Stat));
+                               stats = xreallocarray(stats, nstats, sizeof(Stat));
                        }
 /* XXX OVERFLOW ? */
                        snprintf(pathname, sizeof pathname, "%s%s%s", path,

diff --git a/usr.bin/ssh/ssh-agent.c b/usr.bin/ssh/ssh-agent.c
index cf6e18c..11f5c79 100644 (file)
--- a/usr.bin/ssh/ssh-agent.c
+++ b/usr.bin/ssh/ssh-agent.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-agent.c,v 1.199 2015/03/04 21:12:59 djm Exp $ */
+/* $OpenBSD: ssh-agent.c,v 1.200 2015/04/24 01:36:01 deraadt Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -914,7 +914,7 @@ new_socket(sock_type type, int fd)
                }
        old_alloc = sockets_alloc;
        new_alloc = sockets_alloc + 10;
-       sockets = xrealloc(sockets, new_alloc, sizeof(sockets[0]));
+       sockets = xreallocarray(sockets, new_alloc, sizeof(sockets[0]));
        for (i = old_alloc; i < new_alloc; i++)
                sockets[i].type = AUTH_UNUSED;
        sockets_alloc = new_alloc;

diff --git a/usr.bin/ssh/ssh-keygen.c b/usr.bin/ssh/ssh-keygen.c
index 5548e60..a45e501 100644 (file)
--- a/usr.bin/ssh/ssh-keygen.c
+++ b/usr.bin/ssh/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.269 2015/04/17 13:19:22 djm Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.270 2015/04/24 01:36:01 deraadt Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1572,7 +1572,7 @@ do_ca_sign(struct passwd *pw, int argc, char **argv)
                        otmp = tmp = xstrdup(cert_principals);
                        plist = NULL;
                        for (; (cp = strsep(&tmp, ",")) != NULL; n++) {
-                               plist = xrealloc(plist, n + 1, sizeof(*plist));
+                               plist = xreallocarray(plist, n + 1, sizeof(*plist));
                                if (*(plist[n] = xstrdup(cp)) == '\0')
                                        fatal("Empty principal name");
                        }

diff --git a/usr.bin/ssh/ssh-pkcs11.c b/usr.bin/ssh/ssh-pkcs11.c
index 293c562..561969e 100644 (file)
--- a/usr.bin/ssh/ssh-pkcs11.c
+++ b/usr.bin/ssh/ssh-pkcs11.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-pkcs11.c,v 1.17 2015/02/03 08:07:20 deraadt Exp $ */
+/* $OpenBSD: ssh-pkcs11.c,v 1.18 2015/04/24 01:36:01 deraadt Exp $ */
 /*
  * Copyright (c) 2010 Markus Friedl.  All rights reserved.
  *
@@ -516,7 +516,7 @@ pkcs11_fetch_keys_filter(struct pkcs11_provider *p, CK_ULONG slotidx,
                                sshkey_free(key);
                        } else {
                                /* expand key array and add key */
-                               *keysp = xrealloc(*keysp, *nkeys + 1,
+                               *keysp = xreallocarray(*keysp, *nkeys + 1,
                                    sizeof(struct sshkey *));
                                (*keysp)[*nkeys] = key;
                                *nkeys = *nkeys + 1;

diff --git a/usr.bin/ssh/xmalloc.c b/usr.bin/ssh/xmalloc.c
index d2bbfe2..0f37c61 100644 (file)
--- a/usr.bin/ssh/xmalloc.c
+++ b/usr.bin/ssh/xmalloc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xmalloc.c,v 1.31 2015/02/06 23:21:59 millert Exp $ */
+/* $OpenBSD: xmalloc.c,v 1.32 2015/04/24 01:36:01 deraadt Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -52,22 +52,14 @@ xcalloc(size_t nmemb, size_t size)
 }
 
 void *
-xrealloc(void *ptr, size_t nmemb, size_t size)
+xreallocarray(void *ptr, size_t nmemb, size_t size)
 {
        void *new_ptr;
-       size_t new_size = nmemb * size;
 
-       if (new_size == 0)
-               fatal("xrealloc: zero size");
-       if (SIZE_MAX / nmemb < size)
-               fatal("xrealloc: nmemb * size > SIZE_MAX");
-       if (ptr == NULL)
-               new_ptr = malloc(new_size);
-       else
-               new_ptr = realloc(ptr, new_size);
+       new_ptr = reallocarray(ptr, nmemb, size);
        if (new_ptr == NULL)
-               fatal("xrealloc: out of memory (new_size %zu bytes)",
-                   new_size);
+               fatal("xreallocarray: out of memory (%zu elements of %zu bytes)",
+                   nmemb, size);
        return new_ptr;
 }
 

diff --git a/usr.bin/ssh/xmalloc.h b/usr.bin/ssh/xmalloc.h
index 261dfd6..2bec77b 100644 (file)
--- a/usr.bin/ssh/xmalloc.h
+++ b/usr.bin/ssh/xmalloc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: xmalloc.h,v 1.14 2013/05/17 00:13:14 djm Exp $ */
+/* $OpenBSD: xmalloc.h,v 1.15 2015/04/24 01:36:01 deraadt Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -18,7 +18,7 @@
 
 void   *xmalloc(size_t);
 void   *xcalloc(size_t, size_t);
-void   *xrealloc(void *, size_t, size_t);
+void   *xreallocarray(void *, size_t, size_t);
 char   *xstrdup(const char *);
 int     xasprintf(char **, const char *, ...)
                 __attribute__((__format__ (printf, 2, 3)))