osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

TDS: Improve handling of SYBLONGBINARY 

Use FT_UINT_BYTES to handle SYBLONGBINARY cleanly.

Change-Id: Ie88c19bb788670190113c8c1e962660162ce3780
Reviewed-on: https://code.wireshark.org/review/29273
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Craig Jackson 2018-08-23 12:42:02 -04:00 committed by Anders Broman
parent ca339d7e7f
commit 27ecae3548
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
epan/dissectors/packet-tds.c
View File

@ -2556,20 +2556,11 @@ dissect_tds_type_varbyte(tvbuff_t *tvb, guint *offset, packet_info *pinfo, proto
break;
/* LONGLEN_TYPE - types prefixed with 4-byte length */
/* SYBLONGCHAR would be here, but there is an ambiguity with TDS 7.x.
* It is handled under TDS_DATA_TYPE_BIGCHAR. */
/* SYBLONGCHAR would be similar, but there is an ambiguity with TDS 7.x.
* It is handled under TDS_DATA_TYPE_BIGCHAR above. */
case TDS_DATA_TYPE_LONGBINARY: /* Long Binary (TDS 5.0) */
proto_tree_add_item_ret_uint(sub_tree, hf_tds_type_varbyte_length, tvb, *offset, 4,
proto_tree_add_item_ret_length(sub_tree, hf_tds_type_varbyte_data_uint_bytes, tvb, *offset, 4,
tds_get_int4_encoding(tds_info), &length);
*offset += 4;
switch(data_type) {
case TDS_DATA_TYPE_LONGBINARY: /* Long Binary (TDS 5.0) */
proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_bytes, tvb, *offset, length, ENC_NA);
break;
default: /*TODO Just in case, for future related types. */
proto_tree_add_item(sub_tree, hf_tds_type_varbyte_data_bytes, tvb, *offset, length, ENC_NA);
break;
}
*offset += length;
break;
@ -9812,7 +9803,7 @@ proto_register_tds(void)
},
{ &hf_tds_type_varbyte_data_uint_bytes,
{ "Data", "tds.type_varbyte.data.uint_bytes",
FT_UINT_BYTES, BASE_NONE, NULL, 0x0,
FT_UINT_BYTES, BASE_NONE|BASE_ALLOW_ZERO, NULL, 0x0,
NULL, HFILL }
},
{ &hf_tds_type_varbyte_data_guid,