diff options
| author | lego <lego@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-08-04 23:25:07 +0000 |
|---|---|---|
| committer | lego <lego@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-08-04 23:25:07 +0000 |
| commit | 226cc61be1e85462182935cf8156d0d35137c9c9 (patch) | |
| tree | 8c2ae639b84c9250cd51d34262cb45f5218f5575 /epan/dissectors/packet-k12.c | |
| parent | 55be0be163a8391ba9f37a7a1b90159ea3f216cf (diff) | |
if it's se allocated it needs to be filled only once.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25924 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-k12.c')
| -rw-r--r-- | epan/dissectors/packet-k12.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/epan/dissectors/packet-k12.c b/epan/dissectors/packet-k12.c index b959ccca07..0d982c38ed 100644 --- a/epan/dissectors/packet-k12.c +++ b/epan/dissectors/packet-k12.c @@ -281,11 +281,9 @@ dissect_k12(tvbuff_t* tvb,packet_info* pinfo,proto_tree* tree) sscop_payload_info *p_sscop_info = p_get_proto_data(pinfo->fd, proto_sscop); if (!p_sscop_info) { p_sscop_info = se_alloc0(sizeof(sscop_payload_info)); - if (p_sscop_info) - p_add_proto_data(pinfo->fd, proto_sscop, p_sscop_info); + p_add_proto_data(pinfo->fd, proto_sscop, p_sscop_info); + p_sscop_info->subdissector = handles[i+1]; } - if (p_sscop_info) - p_sscop_info->subdissector = handles[i+1]; } /* Add more protocols here */ } @@ -297,13 +295,12 @@ dissect_k12(tvbuff_t* tvb,packet_info* pinfo,proto_tree* tree) fp_info *p_fp_info = p_get_proto_data(pinfo->fd, proto_fp); if (!p_fp_info) { p_fp_info = se_alloc0(sizeof(fp_info)); - if (p_fp_info) - p_add_proto_data(pinfo->fd, proto_fp, p_fp_info); - } + p_add_proto_data(pinfo->fd, proto_fp, p_fp_info); - fill_fp_info(p_fp_info, - pinfo->pseudo_header->k12.extra_info, - pinfo->pseudo_header->k12.extra_length); + fill_fp_info(p_fp_info, + pinfo->pseudo_header->k12.extra_info, + pinfo->pseudo_header->k12.extra_length); + } } call_dissector(sub_handle, tvb, pinfo, tree); |