diff options
| author | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2004-05-11 02:02:44 +0000 |
|---|---|---|
| committer | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2004-05-11 02:02:44 +0000 |
| commit | 95ea0b4e886840c19a39de17a95c898b81341634 (patch) | |
| tree | 4ab7df7b22e436ddd458f2b5893fd1522e8cb899 | |
| parent | 75f4da6493852cc42e589bf44cf6153f44976124 (diff) | |
Make sure next_level_value isn't NULL before trying to access one of its
members.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@10846 f5534014-38df-0310-8fa8-9805f1628bb7
| -rw-r--r-- | packet-spnego.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/packet-spnego.c b/packet-spnego.c index 357ceef164..c4362e9726 100644 --- a/packet-spnego.c +++ b/packet-spnego.c @@ -5,7 +5,7 @@ * Copyright 2002, Richard Sharpe <rsharpe@ns.aus.com> * Copyright 2003, Richard Sharpe <rsharpe@richardsharpe.com> * - * $Id: packet-spnego.c,v 1.54 2004/04/30 22:19:43 guy Exp $ + * $Id: packet-spnego.c,v 1.55 2004/05/11 02:02:44 gerald Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -145,6 +145,14 @@ static const true_false_string tfs_reqflags_integ = { static dissector_handle_t data_handle; +static dissector_handle_t +gssapi_dissector_handle(gssapi_oid_value *next_level_value) { + if (next_level_value == NULL) { + return NULL; + } + return next_level_value->handle; +} + static void dissect_parse_error(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, const char *field_name, int ret) @@ -950,13 +958,13 @@ dissect_spnego_negTokenInit(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, case SPNEGO_mechToken: offset = dissect_spnego_mechToken(tvb, offset, pinfo, subtree, - hnd, (*next_level_value_p)->handle); + hnd, gssapi_dissector_handle(*next_level_value_p)); break; case SPNEGO_mechListMIC: offset = dissect_spnego_mechListMIC(tvb, offset, pinfo, subtree, - hnd, (*next_level_value_p)->handle); + hnd, gssapi_dissector_handle(*next_level_value_p)); break; default: @@ -1237,19 +1245,13 @@ dissect_spnego_negTokenTarg(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, case SPNEGO_responseToken: offset = dissect_spnego_responseToken(tvb, offset, pinfo, subtree, - hnd, - (*next_level_value_p != NULL) ? - (*next_level_value_p)->handle : - NULL); + hnd, gssapi_dissector_handle(*next_level_value_p)); break; case SPNEGO_mechListMIC: offset = dissect_spnego_mechListMIC(tvb, offset, pinfo, subtree, - hnd, - (*next_level_value_p != NULL) ? - (*next_level_value_p)->handle : - NULL); + hnd, gssapi_dissector_handle(*next_level_value_p)); break; default: |