diff options
| author | Martin Kaiser <wireshark@kaiser.cx> | 2012-12-22 23:56:50 +0000 |
|---|---|---|
| committer | Martin Kaiser <wireshark@kaiser.cx> | 2012-12-22 23:56:50 +0000 |
| commit | 594b0bb11f0be09cf9cd7913badf5d9788a73756 (patch) | |
| tree | 7151ffed76af42ee3fb584c0697444dbc5c58f1f /epan | |
| parent | 3eb2a8644f3ed889bee643b0959eefc65e7637f2 (diff) | |
revert r46678
now that tvb_get_ephemeral_unicode_string() throws an exception for
invalid length parameters, there's no point in doing an explicit check
beforehand
(when I added the check, there were many places that I missed)
svn path=/trunk/; revision=46707
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-ms-mms.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/epan/dissectors/packet-ms-mms.c b/epan/dissectors/packet-ms-mms.c index f4e22e5dc3..2dc6828ebb 100644 --- a/epan/dissectors/packet-ms-mms.c +++ b/epan/dissectors/packet-ms-mms.c @@ -874,9 +874,8 @@ static void dissect_server_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t /* Tool version string */ - if (tool_version_length>1 && tool_version_length<G_MAXINT/2) + if (tool_version_length > 1) { - /* we checked above that tool_version_length*2 fits into a gint */ tool_version = tvb_get_ephemeral_unicode_string(tvb, offset, tool_version_length*2, ENC_LITTLE_ENDIAN); /* Server version string */ |