aboutsummaryrefslogtreecommitdiffstats
path: root/asn1
diff options
context:
space:
mode:
authorJeff Morriss <jeff.morriss.ws@gmail.com>2015-05-29 23:42:15 -0400
committerAnders Broman <a.broman58@gmail.com>2015-05-30 05:47:57 +0000
commite47c4d577548cdee31934ac34dfb91c31777e431 (patch)
treea15625798098f4e365057d79512c80b9e1d526b6 /asn1
parent4ba148771b8f39c8ecc4d496d3eaf861739fdcee (diff)
NULL terminate the list of hfs given to proto_tree_add_bitmask*().
This fixes a number of recent fuzz failures. Bug: 11195 Change-Id: Ifa6cc380fd3f610469d3c795e234e6986cfaf674 Reviewed-on: https://code.wireshark.org/review/8699 Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'asn1')
-rw-r--r--asn1/ldap/ldap.cnf3
1 files changed, 2 insertions, 1 deletions
diff --git a/asn1/ldap/ldap.cnf b/asn1/ldap/ldap.cnf
index 2dfaa53058..1aadfefb6b 100644
--- a/asn1/ldap/ldap.cnf
+++ b/asn1/ldap/ldap.cnf
@@ -778,11 +778,12 @@ offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index, &v
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, -1, &val);
if (val >0) {
- const int * flags[] = {
+ const int *flags[] = {
&hf_ldap_object_security_flag,
&hf_ldap_ancestor_first_flag,
&hf_ldap_public_data_only_flag,
&hf_ldap_incremental_value_flag,
+ NULL
};
proto_tree_add_bitmask_value_with_flags(tree, tvb, otheroffset+1, hf_index,