diff options
Diffstat (limited to 'session.c')
-rw-r--r-- | session.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: session.c,v 1.277 2015/01/16 06:40:12 deraadt Exp $ */ | 1 | /* $OpenBSD: session.c,v 1.278 2015/04/24 01:36:00 deraadt Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 3 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
4 | * All rights reserved | 4 | * All rights reserved |
@@ -997,7 +997,7 @@ child_set_env(char ***envp, u_int *envsizep, const char *name, | |||
997 | if (envsize >= 1000) | 997 | if (envsize >= 1000) |
998 | fatal("child_set_env: too many env vars"); | 998 | fatal("child_set_env: too many env vars"); |
999 | envsize += 50; | 999 | envsize += 50; |
1000 | env = (*envp) = xrealloc(env, envsize, sizeof(char *)); | 1000 | env = (*envp) = xreallocarray(env, envsize, sizeof(char *)); |
1001 | *envsizep = envsize; | 1001 | *envsizep = envsize; |
1002 | } | 1002 | } |
1003 | /* Need to set the NULL pointer at end of array beyond the new slot. */ | 1003 | /* Need to set the NULL pointer at end of array beyond the new slot. */ |
@@ -1914,7 +1914,7 @@ session_new(void) | |||
1914 | return NULL; | 1914 | return NULL; |
1915 | debug2("%s: allocate (allocated %d max %d)", | 1915 | debug2("%s: allocate (allocated %d max %d)", |
1916 | __func__, sessions_nalloc, options.max_sessions); | 1916 | __func__, sessions_nalloc, options.max_sessions); |
1917 | tmp = xrealloc(sessions, sessions_nalloc + 1, | 1917 | tmp = xreallocarray(sessions, sessions_nalloc + 1, |
1918 | sizeof(*sessions)); | 1918 | sizeof(*sessions)); |
1919 | if (tmp == NULL) { | 1919 | if (tmp == NULL) { |
1920 | error("%s: cannot allocate %d sessions", | 1920 | error("%s: cannot allocate %d sessions", |
@@ -2241,7 +2241,7 @@ session_env_req(Session *s) | |||
2241 | for (i = 0; i < options.num_accept_env; i++) { | 2241 | for (i = 0; i < options.num_accept_env; i++) { |
2242 | if (match_pattern(name, options.accept_env[i])) { | 2242 | if (match_pattern(name, options.accept_env[i])) { |
2243 | debug2("Setting env %d: %s=%s", s->num_env, name, val); | 2243 | debug2("Setting env %d: %s=%s", s->num_env, name, val); |
2244 | s->env = xrealloc(s->env, s->num_env + 1, | 2244 | s->env = xreallocarray(s->env, s->num_env + 1, |
2245 | sizeof(*s->env)); | 2245 | sizeof(*s->env)); |
2246 | s->env[s->num_env].name = name; | 2246 | s->env[s->num_env].name = name; |
2247 | s->env[s->num_env].val = val; | 2247 | s->env[s->num_env].val = val; |