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

Do not use packet scope memory outside packet dissectors 

Otherwise it will trigger an assert
Fixes a regression introduced in gf002332

Change-Id: I0cffa2c952b7eff085a1834ebabfec03342095bd
Reviewed-on: https://code.wireshark.org/review/5950
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
This commit is contained in:
Pascal Quantin 2014-12-21 19:25:39 +01:00
parent 9fbede8567
commit bd19532bfb
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/addr_resolv.c
View File

@ -1550,7 +1550,7 @@ eth_addr_resolve(hashether_t *tp) {
/* No match whatsoever. */
SET_ADDRESS(&ether_addr, AT_ETHER, 6, addr);
g_snprintf(tp->resolved_name, MAXNAMELEN, "%s", address_to_str(wmem_packet_scope(), &ether_addr));
g_snprintf(tp->resolved_name, MAXNAMELEN, "%s", ep_address_to_str(&ether_addr));
tp->status = HASHETHER_STATUS_RESOLVED_DUMMY;
return tp;
}

2
epan/proto.c
View File

@ -6060,7 +6060,7 @@ proto_item_fill_label(field_info *fi, gchar *label_str)
label_fill_descr(label_str, 0, hfinfo,
get_ether_name(bytes),
address_to_str(wmem_packet_scope(), &addr ));
ep_address_to_str( &addr ));
break;
case FT_IPv4: