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

Don't use on-the-stack buffers for pinfo addresses. 

pinfo addresses are supposed to be valid after the routine that sets
them exits; therefore, the data mustn't be on the stack.

Change-Id: I7db48065b2cacad200fa6b18e19b68e130e535a5
Reviewed-on: https://code.wireshark.org/review/29492
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2018-09-08 12:47:14 -07:00
parent 64335ba728
commit 8dd322ba98
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
epan/dissectors/packet-bthci_sco.c
View File

@ -66,7 +66,7 @@ dissect_bthci_sco(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat
guint32 k_adapter_id;
remote_bdaddr_t *remote_bdaddr;
const gchar *localhost_name;
guint8 localhost_bdaddr[6];
guint8 *localhost_bdaddr;
const gchar *localhost_ether_addr;
gchar *localhost_addr_name;
gint localhost_length;
@ -221,6 +221,7 @@ dissect_bthci_sco(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat
localhost_bdaddr_entry = (localhost_bdaddr_entry_t *)wmem_tree_lookup32_array_le(bluetooth_data->localhost_bdaddr, key);
localhost_bdaddr = (guint8 *) wmem_alloc(pinfo->pool, 6);
if (localhost_bdaddr_entry && localhost_bdaddr_entry->interface_id == bluetooth_data->interface_id &&
localhost_bdaddr_entry->adapter_id == bluetooth_data->adapter_id) {