From c86c78c25cda8dab5b21b3d4fb976bdb6fa40173 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stig=20Bj=C3=B8rlykke?= Date: Thu, 20 Aug 2015 13:00:24 +0200 Subject: [PATCH 1/5] pcapng: Fixed copying if_filter_bpf_bytes Bug: 11455 Change-Id: I230ae26ef32ffc9d748b9f3da9011da952b6e175 Reviewed-on: https://code.wireshark.org/review/10155 Reviewed-by: Guy Harris (cherry picked from commit 21ec6668d69743153c48adac036f6a22fbf36992) Reviewed-on: https://code.wireshark.org/review/11092 Reviewed-by: Balint Reczey (cherry picked from commit 04ae697234127a8a11d94113a28ee58fdb5e5801) Reviewed-on: https://code.wireshark.org/review/11093 --- wiretap/pcapng.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiretap/pcapng.c b/wiretap/pcapng.c index 31ed90c..4a7960a 100644 --- a/wiretap/pcapng.c +++ b/wiretap/pcapng.c @@ -839,7 +839,7 @@ pcapng_read_if_descr_block(FILE_T fh, pcapng_block_header_t *bh, pcapng_t *pn, } else if (option_content[0] == 1) { wblock->data.if_descr.bpf_filter_len = oh.option_length-1; wblock->data.if_descr.if_filter_bpf_bytes = (gchar *)g_malloc(oh.option_length-1); - memcpy(&wblock->data.if_descr.if_filter_bpf_bytes, option_content+1, oh.option_length-1); + memcpy(wblock->data.if_descr.if_filter_bpf_bytes, option_content+1, oh.option_length-1); } } else { pcapng_debug1("pcapng_read_if_descr_block: if_filter length %u seems strange", oh.option_length); -- 2.1.4