tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-31 01:35:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

upstream commit

Browse Source 
rename xrealloc() to xreallocarray() since it follows
 that form. ok djm
This commit is contained in:
deraadt@openbsd.org 2015-04-24 01:36:00 +00:00 committed by Damien Miller
parent 1108ae242f
commit 657a5fbc0d
14 changed files with 40 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
channels.c
View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -306,7 +306,7 @@ channel_new(char *ctype, int type, int rfd, int wfd, int efd,
if (channels_alloc > 10000) if (channels_alloc > 10000)
fatal("channel_new: internal error: channels_alloc %d " fatal("channel_new: internal error: channels_alloc %d "
"too big.", channels_alloc); "too big.", channels_alloc);
channels = xrealloc(channels, channels_alloc + 10, channels = xreallocarray(channels, channels_alloc + 10,
sizeof(Channel *)); sizeof(Channel *));
channels_alloc += 10; channels_alloc += 10;
debug2("channel: expanding %d", channels_alloc); debug2("channel: expanding %d", channels_alloc);
@ -2192,8 +2192,8 @@ channel_prepare_select(fd_set **readsetp, fd_set **writesetp, int *maxfdp,
/* perhaps check sz < nalloc/2 and shrink? */ /* perhaps check sz < nalloc/2 and shrink? */
if (*readsetp == NULL || sz > *nallocp) { if (*readsetp == NULL || sz > *nallocp) {
*readsetp = xrealloc(*readsetp, nfdset, sizeof(fd_mask)); *readsetp = xreallocarray(*readsetp, nfdset, sizeof(fd_mask));
*writesetp = xrealloc(*writesetp, nfdset, sizeof(fd_mask)); *writesetp = xreallocarray(*writesetp, nfdset, sizeof(fd_mask));
*nallocp = sz; *nallocp = sz;
} }
*maxfdp = n; *maxfdp = n;
@ -3237,7 +3237,7 @@ channel_request_remote_forwarding(struct Forward *fwd)
} }
if (success) { if (success) {
/* Record that connection to this host/port is permitted. */ /* 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)); num_permitted_opens + 1, sizeof(*permitted_opens));
idx = num_permitted_opens++; idx = num_permitted_opens++;
if (fwd->connect_path != NULL) { if (fwd->connect_path != NULL) {
@ -3468,7 +3468,7 @@ channel_add_permitted_opens(char *host, int port)
{ {
debug("allow port forwarding to host %s port %d", host, 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)); num_permitted_opens + 1, sizeof(*permitted_opens));
permitted_opens[num_permitted_opens].host_to_connect = xstrdup(host); permitted_opens[num_permitted_opens].host_to_connect = xstrdup(host);
permitted_opens[num_permitted_opens].port_to_connect = port; permitted_opens[num_permitted_opens].port_to_connect = port;
@ -3518,7 +3518,7 @@ channel_add_adm_permitted_opens(char *host, int port)
{ {
debug("config allows port forwarding to host %s port %d", host, 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)); num_adm_permitted_opens + 1, sizeof(*permitted_adm_opens));
permitted_adm_opens[num_adm_permitted_opens].host_to_connect permitted_adm_opens[num_adm_permitted_opens].host_to_connect
= xstrdup(host); = xstrdup(host);

4
misc.c
View File

@ -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) 2000 Markus Friedl. All rights reserved.
* Copyright (c) 2005,2006 Damien Miller. All rights reserved. * Copyright (c) 2005,2006 Damien Miller. All rights reserved.
@ -472,7 +472,7 @@ addargs(arglist *args, char *fmt, ...)
} else if (args->num+2 >= nalloc) } else if (args->num+2 >= nalloc)
nalloc *= 2; nalloc *= 2;
args->list = xrealloc(args->list, nalloc, sizeof(char *)); args->list = xreallocarray(args->list, nalloc, sizeof(char *));
args->nalloc = nalloc; args->nalloc = nalloc;
args->list[args->num++] = cp; args->list[args->num++] = cp;
args->list[args->num] = NULL; args->list[args->num] = NULL;

4
mux.c
View File

@ -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> * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org>
* *
@ -350,7 +350,7 @@ process_mux_new_session(u_int rid, Channel *c, Buffer *m, Buffer *r)
free(cp); free(cp);
continue; continue;
} }
cctx->env = xrealloc(cctx->env, env_len + 2, cctx->env = xreallocarray(cctx->env, env_len + 2,
sizeof(*cctx->env)); sizeof(*cctx->env));
cctx->env[env_len++] = cp; cctx->env[env_len++] = cp;
cctx->env[env_len] = NULL; cctx->env[env_len] = NULL;

6
readconf.c
View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -295,7 +295,7 @@ add_local_forward(Options *options, const struct Forward *newfwd)
newfwd->listen_path == NULL) newfwd->listen_path == NULL)
fatal("Privileged ports can only be forwarded by root."); fatal("Privileged ports can only be forwarded by root.");
#endif #endif
options->local_forwards = xrealloc(options->local_forwards, options->local_forwards = xreallocarray(options->local_forwards,
options->num_local_forwards + 1, options->num_local_forwards + 1,
sizeof(*options->local_forwards)); sizeof(*options->local_forwards));
fwd = &options->local_forwards[options->num_local_forwards++]; fwd = &options->local_forwards[options->num_local_forwards++];
@ -318,7 +318,7 @@ add_remote_forward(Options *options, const struct Forward *newfwd)
{ {
struct Forward *fwd; struct Forward *fwd;
options->remote_forwards = xrealloc(options->remote_forwards, options->remote_forwards = xreallocarray(options->remote_forwards,
options->num_remote_forwards + 1, options->num_remote_forwards + 1,
sizeof(*options->remote_forwards)); sizeof(*options->remote_forwards));
fwd = &options->remote_forwards[options->num_remote_forwards++]; fwd = &options->remote_forwards[options->num_remote_forwards++];

4
scp.c
View File

@ -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 * scp - secure remote copy. This is basically patched BSD rcp which
* uses ssh to do the data transfer (instead of using rcmd). * uses ssh to do the data transfer (instead of using rcmd).
@ -1333,7 +1333,7 @@ allocbuf(BUF *bp, int fd, int blksize)
if (bp->buf == NULL) if (bp->buf == NULL)
bp->buf = xmalloc(size); bp->buf = xmalloc(size);
else else
bp->buf = xrealloc(bp->buf, 1, size); bp->buf = xreallocarray(bp->buf, 1, size);
memset(bp->buf, 0, size); memset(bp->buf, 0, size);
bp->cnt = size; bp->cnt = size;
return (bp); return (bp);

4
servconf.c
View File

@ -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 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
* All rights reserved * All rights reserved
@ -1444,7 +1444,7 @@ process_server_config_line(ServerOptions *options, char *line,
len = strlen(p) + 1; len = strlen(p) + 1;
while ((arg = strdelim(&cp)) != NULL && *arg != '\0') { while ((arg = strdelim(&cp)) != NULL && *arg != '\0') {
len += 1 + strlen(arg); len += 1 + strlen(arg);
p = xrealloc(p, 1, len); p = xreallocarray(p, 1, len);
strlcat(p, " ", len); strlcat(p, " ", len);
strlcat(p, arg, len); strlcat(p, arg, len);
} }

8
session.c
View File

@ -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 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
* All rights reserved * All rights reserved
@ -997,7 +997,7 @@ child_set_env(char ***envp, u_int *envsizep, const char *name,
if (envsize >= 1000) if (envsize >= 1000)
fatal("child_set_env: too many env vars"); fatal("child_set_env: too many env vars");
envsize += 50; envsize += 50;
env = (*envp) = xrealloc(env, envsize, sizeof(char *)); env = (*envp) = xreallocarray(env, envsize, sizeof(char *));
*envsizep = envsize; *envsizep = envsize;
} }
/* Need to set the NULL pointer at end of array beyond the new slot. */ /* Need to set the NULL pointer at end of array beyond the new slot. */
@ -1914,7 +1914,7 @@ session_new(void)
return NULL; return NULL;
debug2("%s: allocate (allocated %d max %d)", debug2("%s: allocate (allocated %d max %d)",
__func__, sessions_nalloc, options.max_sessions); __func__, sessions_nalloc, options.max_sessions);
tmp = xrealloc(sessions, sessions_nalloc + 1, tmp = xreallocarray(sessions, sessions_nalloc + 1,
sizeof(*sessions)); sizeof(*sessions));
if (tmp == NULL) { if (tmp == NULL) {
error("%s: cannot allocate %d sessions", error("%s: cannot allocate %d sessions",
@ -2241,7 +2241,7 @@ session_env_req(Session *s)
for (i = 0; i < options.num_accept_env; i++) { for (i = 0; i < options.num_accept_env; i++) {
if (match_pattern(name, options.accept_env[i])) { if (match_pattern(name, options.accept_env[i])) {
debug2("Setting env %d: %s=%s", s->num_env, name, val); 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)); sizeof(*s->env));
s->env[s->num_env].name = name; s->env[s->num_env].name = name;
s->env[s->num_env].val = val; s->env[s->num_env].val = val;

4
sftp-client.c
View File

@ -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> * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
* *
@ -621,7 +621,7 @@ do_lsreaddir(struct sftp_conn *conn, const char *path, int print_flag,
error("Server sent suspect path \"%s\" " error("Server sent suspect path \"%s\" "
"during readdir of \"%s\"", filename, path); "during readdir of \"%s\"", filename, path);
} else if (dir) { } 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] = xcalloc(1, sizeof(***dir));
(*dir)[ents]->filename = xstrdup(filename); (*dir)[ents]->filename = xstrdup(filename);
(*dir)[ents]->longname = xstrdup(longname); (*dir)[ents]->longname = xstrdup(longname);

6
sftp-server.c
View File

@ -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. * Copyright (c) 2000-2004 Markus Friedl. All rights reserved.
* *
@ -309,7 +309,7 @@ handle_new(int use, const char *name, int fd, int flags, DIR *dirp)
if (num_handles + 1 <= num_handles) if (num_handles + 1 <= num_handles)
return -1; return -1;
num_handles++; num_handles++;
handles = xrealloc(handles, num_handles, sizeof(Handle)); handles = xreallocarray(handles, num_handles, sizeof(Handle));
handle_unused(num_handles - 1); handle_unused(num_handles - 1);
} }
@ -1062,7 +1062,7 @@ process_readdir(u_int32_t id)
while ((dp = readdir(dirp)) != NULL) { while ((dp = readdir(dirp)) != NULL) {
if (count >= nstats) { if (count >= nstats) {
nstats *= 2; nstats *= 2;
stats = xrealloc(stats, nstats, sizeof(Stat)); stats = xreallocarray(stats, nstats, sizeof(Stat));
} }
/* XXX OVERFLOW ? */ /* XXX OVERFLOW ? */
snprintf(pathname, sizeof pathname, "%s%s%s", path, snprintf(pathname, sizeof pathname, "%s%s%s", path,

4
ssh-agent.c
View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -929,7 +929,7 @@ new_socket(sock_type type, int fd)
} }
old_alloc = sockets_alloc; old_alloc = sockets_alloc;
new_alloc = sockets_alloc + 10; 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++) for (i = old_alloc; i < new_alloc; i++)
sockets[i].type = AUTH_UNUSED; sockets[i].type = AUTH_UNUSED;
sockets_alloc = new_alloc; sockets_alloc = new_alloc;

4
ssh-keygen.c
View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -1592,7 +1592,7 @@ do_ca_sign(struct passwd *pw, int argc, char **argv)
otmp = tmp = xstrdup(cert_principals); otmp = tmp = xstrdup(cert_principals);
plist = NULL; plist = NULL;
for (; (cp = strsep(&tmp, ",")) != NULL; n++) { 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') if (*(plist[n] = xstrdup(cp)) == '\0')
fatal("Empty principal name"); fatal("Empty principal name");
} }

4
ssh-pkcs11.c
View File

@ -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. * Copyright (c) 2010 Markus Friedl. All rights reserved.
* *
@ -527,7 +527,7 @@ pkcs11_fetch_keys_filter(struct pkcs11_provider *p, CK_ULONG slotidx,
sshkey_free(key); sshkey_free(key);
} else { } else {
/* expand key array and add key */ /* expand key array and add key */
*keysp = xrealloc(*keysp, *nkeys + 1, *keysp = xreallocarray(*keysp, *nkeys + 1,
sizeof(struct sshkey *)); sizeof(struct sshkey *));
(*keysp)[*nkeys] = key; (*keysp)[*nkeys] = key;
*nkeys = *nkeys + 1; *nkeys = *nkeys + 1;

18
xmalloc.c
View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -56,22 +56,14 @@ xcalloc(size_t nmemb, size_t size)
} }
void * void *
xrealloc(void *ptr, size_t nmemb, size_t size) xreallocarray(void *ptr, size_t nmemb, size_t size)
{ {
void *new_ptr; void *new_ptr;
size_t new_size = nmemb * size;
if (new_size == 0) new_ptr = reallocarray(ptr, nmemb, size);
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);
if (new_ptr == NULL) if (new_ptr == NULL)
fatal("xrealloc: out of memory (new_size %zu bytes)", fatal("xreallocarray: out of memory (%zu elements of %zu bytes)",
new_size); nmemb, size);
return new_ptr; return new_ptr;
} }

4
xmalloc.h
View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
@ -18,7 +18,7 @@
void *xmalloc(size_t); void *xmalloc(size_t);
void *xcalloc(size_t, 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 *); char *xstrdup(const char *);
int xasprintf(char **, const char *, ...) int xasprintf(char **, const char *, ...)
__attribute__((__format__ (printf, 2, 3))) __attribute__((__format__ (printf, 2, 3)))