summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormartijn <martijn@openbsd.org>2019-08-14 17:20:41 +0000
committermartijn <martijn@openbsd.org>2019-08-14 17:20:41 +0000
commit2e9eee5b0a42594438f2ca9bf35e2a5f16ba098f (patch)
tree40ed5f2ac6d26fcc0bec4f1e781adb76ff233b04
parentmake usage() and SYNOPSIS more alike (diff)
downloadwireguard-openbsd-2e9eee5b0a42594438f2ca9bf35e2a5f16ba098f.tar.xz
wireguard-openbsd-2e9eee5b0a42594438f2ca9bf35e2a5f16ba098f.zip
Make ber_scanf_elements's 'e' attribute eat the element.
Right now all consumers use 'e' at the end of the list, so no regressions should be introduced. OK claudio@ Seems sensible to deraadt@
-rw-r--r--lib/libutil/ber.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libutil/ber.c b/lib/libutil/ber.c
index f38d95b9617..601ed555e7e 100644
--- a/lib/libutil/ber.c
+++ b/lib/libutil/ber.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ber.c,v 1.12 2019/08/14 04:48:13 martijn Exp $ */
+/* $OpenBSD: ber.c,v 1.13 2019/08/14 17:20:41 martijn Exp $ */
/*
* Copyright (c) 2007, 2012 Reyk Floeter <reyk@openbsd.org>
@@ -711,7 +711,7 @@ ber_scanf_elements(struct ber_element *ber, char *fmt, ...)
e = va_arg(ap, struct ber_element **);
*e = ber;
ret++;
- continue;
+ break;
case 'E':
i = va_arg(ap, long long *);
if (ber_get_enumerated(ber, i) == -1)