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

TFTP Header End Fix 

Change-Id: I70d66bb49384f2eac865a81ffc23b76362c37191
Reviewed-on: https://code.wireshark.org/review/35578
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Roman Koshelev 2019-12-29 01:17:41 +03:00 committed by Anders Broman
parent d958375349
commit dc74cfb3f9
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
epan/dissectors/packet-tftp.c
View File

@ -352,6 +352,7 @@ static void dissect_tftp_message(tftp_conv_info_t *tftp_info,
proto_tree *tree)
{
proto_tree *tftp_tree;
proto_item *root_ti;
proto_item *ti;
proto_item *blocknum_item;
gint offset = 0;
@ -366,8 +367,8 @@ static void dissect_tftp_message(tftp_conv_info_t *tftp_info,
col_set_str(pinfo->cinfo, COL_PROTOCOL, "TFTP");
/* Protocol root */
ti = proto_tree_add_item(tree, proto_tftp, tvb, offset, -1, ENC_NA);
tftp_tree = proto_item_add_subtree(ti, ett_tftp);
root_ti = proto_tree_add_item(tree, proto_tftp, tvb, offset, -1, ENC_NA);
tftp_tree = proto_item_add_subtree(root_ti, ett_tftp);
/* Opcode */
opcode = tvb_get_ntohs(tvb, offset);
@ -453,6 +454,7 @@ static void dissect_tftp_message(tftp_conv_info_t *tftp_info,
break;
case TFTP_DATA:
proto_item_set_len(root_ti, 4);
blocknum_item = proto_tree_add_item_ret_uint(tftp_tree, hf_tftp_blocknum, tvb, offset, 2,
ENC_BIG_ENDIAN, &blocknum);