diff options
| author | Martijn van Duren <martijn@cvs.openbsd.org> | 2021-01-28 19:56:34 +0000 |
|---|---|---|
| committer | Martijn van Duren <martijn@cvs.openbsd.org> | 2021-01-28 19:56:34 +0000 |
| commit | 312da1856d9372e1fc726302c4fe87d71ef26478 (patch) | |
| tree | 40c6bbae6cae7a4d8f1f61c8d0efc556b14d41e3 /lib/libutil | |
| parent | cdb2b6a04e2b9584fa0d25d54260f930a18563db (diff) | |
Add '$' to ober_scanf_elements().
This allows us to enforce end of sequence/set without having to manually
check be_next for NULL.
No lib bump needed according to millert@
OK millert@ rob@
Diffstat (limited to 'lib/libutil')
| -rw-r--r-- | lib/libutil/ber.c | 9 | ||||
| -rw-r--r-- | lib/libutil/ober_get_string.3 | 8 |
2 files changed, 13 insertions, 4 deletions
diff --git a/lib/libutil/ber.c b/lib/libutil/ber.c index 11f8952a9c0..25b78308864 100644 --- a/lib/libutil/ber.c +++ b/lib/libutil/ber.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ber.c,v 1.19 2021/01/22 18:27:52 rob Exp $ */ +/* $OpenBSD: ber.c,v 1.20 2021/01/28 19:56:33 martijn Exp $ */ /* * Copyright (c) 2007, 2012 Reyk Floeter <reyk@openbsd.org> @@ -684,9 +684,14 @@ ober_scanf_elements(struct ber_element *ber, char *fmt, ...) va_start(ap, fmt); while (*fmt) { - if (ber == NULL && *fmt != '}' && *fmt != ')') + if (ber == NULL && *fmt != '$' && *fmt != '}' && *fmt != ')') goto fail; switch (*fmt++) { + case '$': + if (ber != NULL) + goto fail; + ret++; + continue; case 'B': ptr = va_arg(ap, void **); len = va_arg(ap, size_t *); diff --git a/lib/libutil/ober_get_string.3 b/lib/libutil/ober_get_string.3 index 0ef49767608..fda9f35718d 100644 --- a/lib/libutil/ober_get_string.3 +++ b/lib/libutil/ober_get_string.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ober_get_string.3,v 1.2 2019/10/25 04:00:10 tb Exp $ +.\" $OpenBSD: ober_get_string.3,v 1.3 2021/01/28 19:56:33 martijn Exp $ .\" .\" Copyright (c) 2007, 2012 Reyk Floeter <reyk@openbsd.org> .\" @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: October 25 2019 $ +.Dd $Mdocdate: January 28 2021 $ .Dt OBER_GET_STRING 3 .Os .Sh NAME @@ -81,6 +81,7 @@ per byte. The following bytes are valid: .Bl -column -offset indent bytes ober_get_enumerated() "1: struct ber_element **" .It Sy byte Ta Sy function Ta Sy arguments +.It $ Ta see below Ta 0 .It B Ta Fn ober_get_bitstring Ta 2: Vt void ** , size_t * .It b Ta Fn ober_get_boolean Ta 1: Vt int * .It d Ta Fn ober_get_integer Ta 1: Vt int * @@ -121,6 +122,9 @@ For .Sq t , the class and type of the element are stored in the two corresponding variables, but if the element contains a value, that value is ignored. +A +.Sq $ +mandates the end of a sequence or set. .Pp For an opening parenthesis or brace, it is checked that the element is a sequence or a set, and parsing continues with its children. |