diff options
| author | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-06-24 19:08:54 +0000 |
|---|---|---|
| committer | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-06-24 19:08:54 +0000 |
| commit | 2baceaeadfcf653c34bf6b5200c2a4a600805375 (patch) | |
| tree | ad31b9f46f74187d0d0c0b9afb3acc299e484d3a /epan/dissectors/packet-rmi.c | |
| parent | 758854c2fe6a110252379d870d15341cc6ddb959 (diff) | |
Noam Rathus discovered that the RMI dissector was using g_strlcpy
incorrectly, which could lead to information disclosure or worse. Use
tvb_format_text instead. This lets us get rid of a character array and
avoids feeding raw packet data to the GUI.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25584 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-rmi.c')
| -rw-r--r-- | epan/dissectors/packet-rmi.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/epan/dissectors/packet-rmi.c b/epan/dissectors/packet-rmi.c index 62947dffc0..1d8a4e355d 100644 --- a/epan/dissectors/packet-rmi.c +++ b/epan/dissectors/packet-rmi.c @@ -125,7 +125,8 @@ dissect_rmi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) rmi_type rmitype; - char epid_hostname[256]; + char *epid_hostname; + guint epid_len; offset = 0; rmitype = 0; @@ -202,17 +203,14 @@ dissect_rmi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) len = tvb_get_ntohs(tvb, 1); proto_tree_add_uint(rmi_tree, hf_rmi_epid_length, tvb, offset + 1, 2, len); - memset(epid_hostname, 0, sizeof(epid_hostname)); - if (len < sizeof(epid_hostname)) { - g_strlcpy(epid_hostname,tvb_get_ptr(tvb, offset + 3, len), - sizeof(epid_hostname)); + epid_len = len < ITEM_LABEL_LENGTH ? len : ITEM_LABEL_LENGTH; + if (epid_len > 0) { + epid_hostname = tvb_format_text(tvb, offset + 3, epid_len); } else { - g_strlcpy(epid_hostname, - "<string too long>", sizeof(epid_hostname)); + epid_hostname = "[Empty]"; } proto_tree_add_string(rmi_tree, hf_rmi_epid_hostname, - tvb, offset + 3, strlen(epid_hostname), - epid_hostname); + tvb, offset + 3, epid_len, epid_hostname); port = tvb_get_ntohs(tvb, offset + len + 5); proto_tree_add_uint(rmi_tree, hf_rmi_epid_port, |