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

manolito (CID 1355642): avoid shifting by 32 bits 

The result of shifting a 32bit value by 32 bits is undefined.

Avoid all of the shift operations. Use the appropriate functions to get
the value from the tvb.

It seems that a manolito integer can be up to 5 octets. Use data types
large enough to store the possible values.

Change-Id: Icc1b538dbd7cdb27700140e9e5b81458b1047537
Reviewed-on: https://code.wireshark.org/review/15481
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
This commit is contained in:
Martin Kaiser 2016-05-16 18:26:37 +02:00
parent 149822017a
commit dd16f650fd
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
epan/dissectors/packet-manolito.c
View File

@ -186,19 +186,29 @@ dissect_manolito(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* diss
offset - start, data, "%s (%s): %s",
(char*)field_name_str, longname, data);
} else if (dtype == MANOLITO_INTEGER) {
int n = 0;
guint64 n = 0;
/* integers can be up to 5 bytes */
switch(length)
{
case 5: n += data[4] << ((length - 5) * 8);
case 4: n += data[3] << ((length - 4) * 8);
case 3: n += data[2] << ((length - 3) * 8);
case 2: n += data[1] << ((length - 2) * 8);
case 1: n += data[0] << ((length - 1) * 8);
case 5:
n = tvb_get_ntoh40(tvb, offset-length);
break;
case 4:
n = tvb_get_ntohl(tvb, offset-length);
break;
case 3:
n = tvb_get_ntoh24(tvb, offset-length);
break;
case 2:
n = tvb_get_ntohs(tvb, offset-length);
break;
case 1:
n = tvb_get_guint8(tvb, offset-length);
break;
}
ti = proto_tree_add_uint_format(manolito_tree, hf_manolito_integer, tvb, start,
1, n, "%s (%s): %d",
ti = proto_tree_add_uint64_format(manolito_tree, hf_manolito_integer, tvb, start,
1, n, "%s (%s): %" G_GINT64_MODIFIER "u",
(char*)field_name_str, longname, n);
proto_item_set_len(ti, offset - start);
} else {
@ -263,7 +273,7 @@ proto_register_manolito(void)
},
{ &hf_manolito_integer,
{ "Integer field", "manolito.integer",
FT_UINT32, BASE_DEC, NULL, 0,
FT_UINT40, BASE_DEC, NULL, 0,
NULL, HFILL }
},
};