diff options
author | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-09-27 21:18:18 +0000 |
---|---|---|
committer | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-09-27 21:18:18 +0000 |
commit | e1a044b8a501c5fdcd6eec6d3266c266195aeb6b (patch) | |
tree | dd3104467814a95249cf3a3f58bfce2e2b61f4b8 /asn1/cmip/packet-cmip-template.c | |
parent | d9394075ce7af1e87ece68368909547d7fc39436 (diff) |
Fix a possible dereference of null pointer when having no tree.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30174 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'asn1/cmip/packet-cmip-template.c')
-rw-r--r-- | asn1/cmip/packet-cmip-template.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/asn1/cmip/packet-cmip-template.c b/asn1/cmip/packet-cmip-template.c index 88b292e092..30c94d1915 100644 --- a/asn1/cmip/packet-cmip-template.c +++ b/asn1/cmip/packet-cmip-template.c @@ -108,18 +108,14 @@ dissect_cmip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) /* do we have spdu type from the session dissector? */ if( !session ){ - if(tree){ - proto_tree_add_text(tree, tvb, 0, -1, - "Internal error:can't get spdu type from session dissector."); - return; - } + proto_tree_add_text(tree, tvb, 0, -1, + "Internal error:can't get spdu type from session dissector."); + return; } else { if(session->spdu_type == 0 ) { - if(tree){ - proto_tree_add_text(tree, tvb, 0, -1, - "Internal error:wrong spdu type %x from session dissector.",session->spdu_type); - return; - } + proto_tree_add_text(tree, tvb, 0, -1, + "Internal error:wrong spdu type %x from session dissector.",session->spdu_type); + return; } } |