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 /epan/dissectors/packet-cmip.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 'epan/dissectors/packet-cmip.c')
| -rw-r--r-- | epan/dissectors/packet-cmip.c | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/epan/dissectors/packet-cmip.c b/epan/dissectors/packet-cmip.c index e8607f4d95..f813241f51 100644 --- a/epan/dissectors/packet-cmip.c +++ b/epan/dissectors/packet-cmip.c @@ -4400,18 +4400,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; } } @@ -5584,7 +5580,7 @@ void proto_register_cmip(void) { NULL, HFILL }}, /*--- End of included file: packet-cmip-hfarr.c ---*/ -#line 193 "packet-cmip-template.c" +#line 187 "packet-cmip-template.c" }; /* List of subtrees */ @@ -5716,7 +5712,7 @@ void proto_register_cmip(void) { &ett_cmip_T_modificationList_item, /*--- End of included file: packet-cmip-ettarr.c ---*/ -#line 199 "packet-cmip-template.c" +#line 193 "packet-cmip-template.c" }; /* Register protocol */ @@ -5801,7 +5797,7 @@ void proto_register_cmip(void) { /*--- End of included file: packet-cmip-dis-tab.c ---*/ -#line 208 "packet-cmip-template.c" +#line 202 "packet-cmip-template.c" oid_add_from_string("discriminatorId(1)","2.9.3.2.7.1"); } |