diff options
| author | Evan Huus <eapache@gmail.com> | 2013-02-23 15:22:40 +0000 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2013-02-23 15:22:40 +0000 |
| commit | 4c4abaf7712e5b7272f914531f8cd3a11d53ddd4 (patch) | |
| tree | f5313b17276732be440a64dd589bcb7c1fdfdcc5 /epan/dissectors/packet-ms-mms.c | |
| parent | cafb554d298438a25c257c25f19fc54806be4331 (diff) | |
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8382
Don't pass a length longer than the strlen of the string into
format_text(). This can happen if the length we ask for from the
tvb overflows, for example.
svn path=/trunk/; revision=47839
Diffstat (limited to 'epan/dissectors/packet-ms-mms.c')
| -rw-r--r-- | epan/dissectors/packet-ms-mms.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-ms-mms.c b/epan/dissectors/packet-ms-mms.c index ec2eb6519c..5ab1b09d94 100644 --- a/epan/dissectors/packet-ms-mms.c +++ b/epan/dissectors/packet-ms-mms.c @@ -881,7 +881,7 @@ static void dissect_server_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t /* Server version string */ proto_tree_add_string(tree, hf_msmms_command_tool_version, tvb, offset, tool_version_length*2, - format_text((guchar*)tool_version, tool_version_length)); + format_text((guchar*)tool_version, MIN(strlen(tool_version), tool_version_length))); } offset += (tool_version_length*2); |