summaryrefslogtreecommitdiff
path: root/asn1/spnego/spnego.cnf
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2005-09-19 16:23:05 +0000
committerGerald Combs <gerald@wireshark.org>2005-09-19 16:23:05 +0000
commitd2e3d4504243ae727759dd2b48dbbd7ce70a05dc (patch)
treed0d6ae60174ae75739a8b4d79e92a6889f1f87d9 /asn1/spnego/spnego.cnf
parentf10f911bce7904d2020162da36fd23f8d330699c (diff)
downloadwireshark-d2e3d4504243ae727759dd2b48dbbd7ce70a05dc.tar.gz
In the SPNEGO dissector, don't call a subdissector if we don't have a TVB.
Fixes bugs 448, 449, 451, 452, 454, 456, and 461. Add similar TVB checks to the BER dissector. svn path=/trunk/; revision=15869
Diffstat (limited to 'asn1/spnego/spnego.cnf')
-rw-r--r--asn1/spnego/spnego.cnf5
1 files changed, 4 insertions, 1 deletions
diff --git a/asn1/spnego/spnego.cnf b/asn1/spnego/spnego.cnf
index 476e4ce3b3..9b8fef959f 100644
--- a/asn1/spnego/spnego.cnf
+++ b/asn1/spnego/spnego.cnf
@@ -111,11 +111,14 @@
#.FN_BODY NegTokenInit/mechToken
- tvbuff_t *mechToken_tvb;
+ tvbuff_t *mechToken_tvb = NULL;
%(DEFAULT_BODY)s
+ if (! mechToken_tvb) {
+ THROW(ReportedBoundsError);
+ }
/*
* Now, we should be able to dispatch after creating a new TVB.