diff options
| author | Guy Harris <guy@alum.mit.edu> | 2004-12-21 20:36:50 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2004-12-21 20:36:50 +0000 |
| commit | c415e09f200e63d23bd47d05f127af182a610675 (patch) | |
| tree | 6c937dd778fec5c781aa6a5e1e2ec4e0c551e9a7 /epan | |
| parent | 5694ead821c0f13e4ec6df9869e4579c5f3eef26 (diff) | |
| download | wireshark-c415e09f200e63d23bd47d05f127af182a610675.tar.gz wireshark-c415e09f200e63d23bd47d05f127af182a610675.tar.bz2 wireshark-c415e09f200e63d23bd47d05f127af182a610675.zip | |
Use "format_text()" on strings, to better handle non-printable
characters.
svn path=/trunk/; revision=12805
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-mmse.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/epan/dissectors/packet-mmse.c b/epan/dissectors/packet-mmse.c index 4fcfbb419f..f836249b2e 100644 --- a/epan/dissectors/packet-mmse.c +++ b/epan/dissectors/packet-mmse.c @@ -44,6 +44,7 @@ #include <glib.h> #include <epan/packet.h> +#include <epan/strutil.h> #include "packet-wap.h" #include "packet-wsp.h" /* #include "packet-mmse.h" */ /* We autoregister */ @@ -1172,7 +1173,8 @@ dissect_mmse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 pdut, hf_mmse_prev_sent_by, tvb, offset - 1, 1 + count + length, strval, "%s (Forwarded-count=%u)", - strval, fwd_count); + format_text(strval, strlen(strval)), + fwd_count); subtree = proto_item_add_subtree(ti, ett_mmse_hdr_details); proto_tree_add_uint(subtree, @@ -1208,7 +1210,8 @@ dissect_mmse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 pdut, hf_mmse_prev_sent_date, tvb, offset - 1, 1 + count + length, strval, "%s (Forwarded-count=%u)", - strval, fwd_count); + format_text(strval, strlen(strval)), + fwd_count); subtree = proto_item_add_subtree(ti, ett_mmse_hdr_details); proto_tree_add_uint(subtree, @@ -1245,7 +1248,8 @@ dissect_mmse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 pdut, if (tree) { proto_tree_add_text(mmse_tree, tvb, offset - 1, length + 1, "%s: %s (Not decoded)", - hdr_name, strval); + hdr_name, + format_text(strval, strlen(strval))); g_free(strval); } } else { /* General form with length */ @@ -1282,7 +1286,9 @@ dissect_mmse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 pdut, length + length2, (const char *) tvb_get_ptr( tvb, offset, length + length2), - "%s: %s", strval, strval2); + "%s: %s", + format_text(strval, strlen(strval)), + format_text(strval2, strlen(strval2))); } g_free(strval2); offset += length + length2; |