diff options
author | Stig Bjørlykke <stig@bjorlykke.org> | 2009-09-27 21:18:18 +0000 |
---|---|---|
committer | Stig Bjørlykke <stig@bjorlykke.org> | 2009-09-27 21:18:18 +0000 |
commit | 8fce84f9e2bfabd2feca73c4b05358c03d272b4a (patch) | |
tree | dd3104467814a95249cf3a3f58bfce2e2b61f4b8 /asn1 | |
parent | 7e458f40e5db1007f2bb6792556bc81e274d5322 (diff) |
Fix a possible dereference of null pointer when having no tree.
svn path=/trunk/; revision=30174
Diffstat (limited to 'asn1')
-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; } } |