diff options
| author |   doug <doug@openbsd.org> | 2015-04-29 01:27:34 +0000 |
|---|---|---|
| committer | doug <doug@openbsd.org> | 2015-04-29 01:27:34 +0000 |
| commit | 874a9cdc392e63fbc0fb725a4b63acb245b75a6e (patch) | |
| tree | c3cf55565374ededaea479ca423e087f22dc269f /lib/libssl/bs_cbs.c | |
| parent | Added error checking for len argument in cbs_get_u(). (diff) | |
| download | wireguard-openbsd-874a9cdc392e63fbc0fb725a4b63acb245b75a6e.tar.xz wireguard-openbsd-874a9cdc392e63fbc0fb725a4b63acb245b75a6e.zip | |
Avoid NULL deref in CBS_get_any_asn1_element().
This function is documented as allowing NULL for out_header_len.
ok jsing@
Diffstat (limited to 'lib/libssl/bs_cbs.c')
| -rw-r--r-- | lib/libssl/bs_cbs.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/libssl/bs_cbs.c b/lib/libssl/bs_cbs.c index fc2eafff0eb..0237f736819 100644 --- a/lib/libssl/bs_cbs.c +++ b/lib/libssl/bs_cbs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bs_cbs.c,v 1.5 2015/04/29 01:23:20 doug Exp $ */ +/* $OpenBSD: bs_cbs.c,v 1.6 2015/04/29 01:27:34 doug Exp $ */ /* * Copyright (c) 2014, Google Inc. * @@ -236,7 +236,8 @@ CBS_get_any_asn1_element(CBS *cbs, CBS *out, unsigned *out_tag, if ((tag & CBS_ASN1_CONSTRUCTED) != 0 && num_bytes == 0) { /* indefinite length */ - *out_header_len = 2; + if (out_header_len != NULL) + *out_header_len = 2; return CBS_get_bytes(cbs, out, 2); } |