aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-gssapi.c
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2009-11-19 22:41:01 +0000
committerGerald Combs <gerald@wireshark.org>2009-11-19 22:41:01 +0000
commit8533da1c9420aa7ddd6d647a9b5ee64c33eab904 (patch)
tree47916f728dc26e2f1f8c5636b6e2207eaf821908 /epan/dissectors/packet-gssapi.c
parente18f01d4102acec907d4d4ed91245f968f06f123 (diff)
Don't call tvb_new_subset on a NULL pointer. Fixes bug 4101.
svn path=/trunk/; revision=31029
Diffstat (limited to 'epan/dissectors/packet-gssapi.c')
-rw-r--r--epan/dissectors/packet-gssapi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-gssapi.c b/epan/dissectors/packet-gssapi.c
index 19038653ce..faa0bd7c7f 100644
--- a/epan/dissectors/packet-gssapi.c
+++ b/epan/dissectors/packet-gssapi.c
@@ -332,7 +332,7 @@ dissect_gssapi_work(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
tvb_new_subset(gss_tvb, start_offset, -1, -1),
pinfo, subtree);
}
- else {
+ else if( pinfo->gssapi_encrypted_tvb ) {
return_offset = call_dissector(ntlmssp_data_only_handle,
tvb_new_subset(pinfo->gssapi_encrypted_tvb, 0, -1, -1),
pinfo, subtree);