diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2009-10-25 11:43:30 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2009-10-25 11:43:30 +0000 |
| commit | 88bb44a51e350c9749323242482dc5e944697d8f (patch) | |
| tree | a19835aec094d07536c6def639d5d5d236f0a1cd /epan/dissectors/packet-dtn.c | |
| parent | 337896f4c6777bc0b84a2e017ebcbb52100a312b (diff) | |
| download | wireshark-88bb44a51e350c9749323242482dc5e944697d8f.tar.gz wireshark-88bb44a51e350c9749323242482dc5e944697d8f.tar.bz2 wireshark-88bb44a51e350c9749323242482dc5e944697d8f.zip | |
From Jakub Zawadzki:
Cleanup dissector code - use proper memory functions.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4164
svn path=/trunk/; revision=30691
Diffstat (limited to 'epan/dissectors/packet-dtn.c')
| -rw-r--r-- | epan/dissectors/packet-dtn.c | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/epan/dissectors/packet-dtn.c b/epan/dissectors/packet-dtn.c index e7dea47dc8..e81953e3e3 100644 --- a/epan/dissectors/packet-dtn.c +++ b/epan/dissectors/packet-dtn.c @@ -670,8 +670,8 @@ dissect_primary_header(packet_info *pinfo, proto_tree *primary_tree, tvbuff_t *t int dst_scheme_pos, src_scheme_pos, rpt_scheme_pos, cust_scheme_pos; int dst_scheme_len, src_scheme_len, rpt_scheme_len, cust_scheme_len; int dst_ssp_len, src_ssp_len, rpt_ssp_len, cust_ssp_len; - gchar *src_node; - gchar *dst_node; + const gchar *src_node; + const gchar *dst_node; guint8 srrflags; guint8 version; @@ -921,24 +921,22 @@ dissect_primary_header(packet_info *pinfo, proto_tree *primary_tree, tvbuff_t *t cust_scheme_len + cust_ssp_len, "Custodian: %d.%d",cust_scheme_offset,cust_ssp_offset); } - src_node = ep_alloc(NODE_NAME_STR_SIZE); - dst_node = ep_alloc(NODE_NAME_STR_SIZE); if(source_scheme_offset == 0 && source_ssp_offset == 0) { - g_snprintf(src_node,5,"Null"); + src_node = "Null"; } else { - g_snprintf(src_node,NODE_NAME_STR_SIZE,"%s:%d.%d",IPN_SCHEME_STR, source_scheme_offset, source_ssp_offset); + src_node = ep_strdup_printf("%s:%d.%d",IPN_SCHEME_STR, source_scheme_offset, source_ssp_offset); } if(dest_scheme_offset == 0 && dest_ssp_offset == 0) { - g_snprintf(dst_node,5,"Null"); + dst_node = "Null"; } else { - g_snprintf(dst_node,NODE_NAME_STR_SIZE,"%s:%d.%d",IPN_SCHEME_STR, dest_scheme_offset, dest_ssp_offset); + dst_node = ep_strdup_printf("%s:%d.%d",IPN_SCHEME_STR, dest_scheme_offset, dest_ssp_offset); } col_add_fstr(pinfo->cinfo, COL_INFO, "%s > %s", src_node,dst_node); @@ -1412,24 +1410,22 @@ dissect_version_5_primary_header(packet_info *pinfo, cust_scheme_len + cust_ssp_len, "Custodian: %d.%d",cust_scheme_offset,cust_ssp_offset); } - src_node = ep_alloc(NODE_NAME_STR_SIZE); - dst_node = ep_alloc(NODE_NAME_STR_SIZE); if(source_scheme_offset == 0 && source_ssp_offset == 0) { - g_snprintf(src_node,5,"Null"); + src_node = "Null"; } else { - g_snprintf(src_node,NODE_NAME_STR_SIZE,"%s:%d.%d",IPN_SCHEME_STR, source_scheme_offset, source_ssp_offset); + src_node = ep_strdup_printf("%s:%d.%d",IPN_SCHEME_STR, source_scheme_offset, source_ssp_offset); } if(dest_scheme_offset == 0 && dest_ssp_offset == 0) { - g_snprintf(dst_node,5,"Null"); + dst_node = "Null"; } else { - g_snprintf(dst_node,NODE_NAME_STR_SIZE,"%s:%d.%d",IPN_SCHEME_STR, dest_scheme_offset, dest_ssp_offset); + dst_node = ep_strdup_printf("%s:%d.%d",IPN_SCHEME_STR, dest_scheme_offset, dest_ssp_offset); } col_add_fstr(pinfo->cinfo, COL_INFO, "%s > %s", src_node, dst_node); |