diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2012-08-23 19:07:24 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2012-08-23 19:07:24 +0000 |
| commit | 64fa3d40368c3c592116ed64485e9f678e8eebef (patch) | |
| tree | 855b50d8ad88d0c1c3fe09efb773c8886571cc42 /epan/dissectors/packet-llrp.c | |
| parent | 8f7de2ba4ee9eacf3a0d06c439a2c67c6207e9ca (diff) | |
Don't call dissect_custom_message() when it's not initialized.
svn path=/trunk/; revision=44646
Diffstat (limited to 'epan/dissectors/packet-llrp.c')
| -rw-r--r-- | epan/dissectors/packet-llrp.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/epan/dissectors/packet-llrp.c b/epan/dissectors/packet-llrp.c index 14a33630fb..a8b446214e 100644 --- a/epan/dissectors/packet-llrp.c +++ b/epan/dissectors/packet-llrp.c @@ -1693,7 +1693,7 @@ dissect_llrp_parameters(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, { type = tvb_get_ntohs(tvb, offset); len = tvb_get_ntohs(tvb, offset + 2); - + param_end = offset + len; if (len < LLRP_TLV_LEN_MIN) @@ -2383,7 +2383,7 @@ dissect_llrp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 spec_id, vendor; proto_item *request_item, *antenna_item, *gpi_item, *gpo_item; guint (*dissect_custom_message)(tvbuff_t *tvb, - packet_info *pinfo, proto_tree *tree, guint offset); + packet_info *pinfo, proto_tree *tree, guint offset) = NULL; ends_with_parameters = FALSE; switch (type) @@ -2562,7 +2562,8 @@ dissect_llrp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, ends_with_parameters = TRUE; break; } - offset = dissect_custom_message(tvb, pinfo, tree, offset); + if (dissect_custom_message) + offset = dissect_custom_message(tvb, pinfo, tree, offset); break; /* Some have no extra data expected */ case LLRP_TYPE_KEEPALIVE: |