diff options
author | deraadt@openbsd.org <deraadt@openbsd.org> | 2015-04-24 01:36:00 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-04-29 18:15:23 +1000 |
commit | 657a5fbc0d0aff309079ff8fb386f17e964963c2 (patch) | |
tree | 942146a8381a12903fdfaec579b9ff2b2bf41406 /servconf.c | |
parent | 1108ae242fdd2c304307b68ddf46aebe43ebffaa (diff) |
upstream commit
rename xrealloc() to xreallocarray() since it follows
that form. ok djm
Diffstat (limited to 'servconf.c')
-rw-r--r-- | servconf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/servconf.c b/servconf.c index fb1d024ef..d4a48a016 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -1,5 +1,5 @@ | |||
1 | 1 | ||
2 | /* $OpenBSD: servconf.c,v 1.263 2015/04/23 04:59:10 dtucker Exp $ */ | 2 | /* $OpenBSD: servconf.c,v 1.264 2015/04/24 01:36:00 deraadt Exp $ */ |
3 | /* | 3 | /* |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
5 | * All rights reserved | 5 | * All rights reserved |
@@ -1444,7 +1444,7 @@ process_server_config_line(ServerOptions *options, char *line, | |||
1444 | len = strlen(p) + 1; | 1444 | len = strlen(p) + 1; |
1445 | while ((arg = strdelim(&cp)) != NULL && *arg != '\0') { | 1445 | while ((arg = strdelim(&cp)) != NULL && *arg != '\0') { |
1446 | len += 1 + strlen(arg); | 1446 | len += 1 + strlen(arg); |
1447 | p = xrealloc(p, 1, len); | 1447 | p = xreallocarray(p, 1, len); |
1448 | strlcat(p, " ", len); | 1448 | strlcat(p, " ", len); |
1449 | strlcat(p, arg, len); | 1449 | strlcat(p, arg, len); |
1450 | } | 1450 | } |