osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Fix error caught by valgrind where we were running off the end of a 

variable because we were passing the address of a single guint8 as a
char*. Work around it by making the guint8 an array and filling the last
element with 0 as if it were a null-terminated string.

svn path=/trunk/; revision=45339
This commit is contained in:
Evan Huus 2012-10-06 14:23:44 +00:00
parent 062ad6bad1
commit dfd86092f2
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1876,7 +1876,8 @@ dissect_linux_usb_pseudo_header(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t
guint8 transfer_type;
guint8 endpoint_number;
guint8 transfer_type_and_direction;
guint8 type, flag;
guint8 type;
guint8 flag[2];
guint16 val16;
guint32 val32;
guint64 val64;
@ -1909,20 +1910,22 @@ dissect_linux_usb_pseudo_header(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t
* sizeof(struct usb_device_setup_hdr) bytes. The content of these
* bytes only have meaning in case setup_flag == 0.
*/
flag = tvb_get_guint8(tvb, 14);
if (flag == 0) {
flag[0] = tvb_get_guint8(tvb, 14);
flag[1] = '\0';
if (flag[0] == 0) {
proto_tree_add_string(tree, hf_usb_setup_flag, tvb, 14, 1, "relevant (0)");
} else {
proto_tree_add_string_format_value(tree, hf_usb_setup_flag, tvb,
14, 1, &flag, "not relevant ('%c')", isprint(flag) ? flag: '.');
14, 1, flag, "not relevant ('%c')", isprint(flag[0]) ? flag[0]: '.');
}
flag = tvb_get_guint8(tvb, 15);
if (flag == 0) {
flag[0] = tvb_get_guint8(tvb, 15);
flag[1] = '\0';
if (flag[0] == 0) {
proto_tree_add_string(tree, hf_usb_data_flag, tvb, 15, 1, "present (0)");
} else {
proto_tree_add_string_format_value(tree, hf_usb_data_flag, tvb,
15, 1, &flag, "not present ('%c')", isprint(flag) ? flag : '.');
15, 1, flag, "not present ('%c')", isprint(flag[0]) ? flag[0] : '.');
}
tvb_memcpy(tvb, (guint8 *)&val64, 16, 8);