diff options
| author |   dtucker <dtucker@openbsd.org> | 2020-05-29 09:02:44 +0000 |
|---|---|---|
| committer | dtucker <dtucker@openbsd.org> | 2020-05-29 09:02:44 +0000 |
| commit | 151ba632fd9dcb2d5b70ce18d6433d61357e9995 (patch) | |
| tree | 82ea00276bbcf6cf2f191c4538e514d0cbee313e | |
| parent | If no station happens to be associated when ieee80211_setkeys() runs then (diff) | |
| download | wireguard-openbsd-151ba632fd9dcb2d5b70ce18d6433d61357e9995.tar.xz wireguard-openbsd-151ba632fd9dcb2d5b70ce18d6433d61357e9995.zip | |
Pass a NULL instead of zeroed out va_list from dollar_expand. The original
intent was in case there's some platform where va_list is not a pointer
equivalent, but on i386 this chokes on the memset. This unbreaks that
build, but will require further consideration.
| -rw-r--r-- | usr.bin/ssh/misc.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/usr.bin/ssh/misc.c b/usr.bin/ssh/misc.c index 73c86438904..e35420d60f4 100644 --- a/usr.bin/ssh/misc.c +++ b/usr.bin/ssh/misc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: misc.c,v 1.150 2020/05/29 04:25:40 dtucker Exp $ */ +/* $OpenBSD: misc.c,v 1.151 2020/05/29 09:02:44 dtucker Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2005-2020 Damien Miller. All rights reserved. @@ -1177,10 +1177,8 @@ dollar_expand(int *parseerr, const char *string) { char *ret; int err; - va_list ap; - memset(ap, 0, sizeof(ap)); /* unused */ - ret = vdollar_percent_expand(&err, 1, 0, string, ap); + ret = vdollar_percent_expand(&err, 1, 0, string, NULL); if (parseerr != NULL) *parseerr = err; return ret; |