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

proto: Fix address display for ETHER, AX25, etc. 

We were erroneously passing a GBytes pointer instead of a byte
array.

Fixes 0f66c595e2.
This commit is contained in:
João Valverde 2023-04-22 03:55:55 +01:00
parent 53b1930b02
commit 153403f79a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
epan/proto.c
View File

@ -6669,14 +6669,14 @@ proto_item_fill_display_label(field_info *finfo, gchar *display_label_str, const
break;
case FT_FCWWN:
set_address (&addr, AT_FCWWN, FCWWN_ADDR_LEN, fvalue_get_bytes(finfo->value));
set_address (&addr, AT_FCWWN, FCWWN_ADDR_LEN, fvalue_get_bytes_data(finfo->value));
tmp_str = address_to_display(NULL, &addr);
label_len = protoo_strlcpy(display_label_str, tmp_str, label_str_size);
wmem_free(NULL, tmp_str);
break;
case FT_ETHER:
set_address (&addr, AT_ETHER, FT_ETHER_LEN, fvalue_get_bytes(finfo->value));
set_address (&addr, AT_ETHER, FT_ETHER_LEN, fvalue_get_bytes_data(finfo->value));
tmp_str = address_to_display(NULL, &addr);
label_len = protoo_strlcpy(display_label_str, tmp_str, label_str_size);
wmem_free(NULL, tmp_str);
@ -9337,7 +9337,7 @@ proto_item_fill_label(field_info *fi, gchar *label_str)
case FT_AX25:
addr.type = AT_AX25;
addr.len = AX25_ADDR_LEN;
addr.data = fvalue_get_bytes(fi->value);
addr.data = fvalue_get_bytes_data(fi->value);
addr_str = (char*)address_to_str(NULL, &addr);
snprintf(label_str, ITEM_LABEL_LENGTH,
@ -9348,7 +9348,7 @@ proto_item_fill_label(field_info *fi, gchar *label_str)
case FT_VINES:
addr.type = AT_VINES;
addr.len = VINES_ADDR_LEN;
addr.data = fvalue_get_bytes(fi->value);
addr.data = fvalue_get_bytes_data(fi->value);
addr_str = (char*)address_to_str(NULL, &addr);
snprintf(label_str, ITEM_LABEL_LENGTH,