diff options
| author | Evan Huus <eapache@gmail.com> | 2014-09-23 00:26:28 -0400 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2014-09-23 04:27:59 +0000 |
| commit | ad6a66388d7ded3743283f573738b122a2bccd3b (patch) | |
| tree | 7a61722d66bef30059839120bcd86e9da0b128cc /wiretap | |
| parent | 725538050d5ce712141cbbe2c16324b2aafa44b0 (diff) | |
pcapng: ensure the values we now free are initialized
Should fix the remaining test suite failures.
Change-Id: I50a6cb1bf57bd6a973d4777349708b75aeb41620
Reviewed-on: https://code.wireshark.org/review/4264
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/pcapng.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/wiretap/pcapng.c b/wiretap/pcapng.c index 9fcf81d81a..1a7355dbe1 100644 --- a/wiretap/pcapng.c +++ b/wiretap/pcapng.c @@ -2353,6 +2353,10 @@ pcapng_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset) wblock.frame_buffer = wth->frame_buffer; wblock.packet_header = &wth->phdr; wblock.file_encap = &wth->file_encap; + wblock.data.section.opt_comment = NULL; + wblock.data.section.shb_hardware = NULL; + wblock.data.section.shb_os = NULL; + wblock.data.section.shb_user_appl = NULL; pcapng->add_new_ipv4 = wth->add_new_ipv4; pcapng->add_new_ipv6 = wth->add_new_ipv6; @@ -2466,6 +2470,10 @@ pcapng_seek_read(wtap *wth, gint64 seek_off, wblock.frame_buffer = buf; wblock.packet_header = phdr; wblock.file_encap = &wth->file_encap; + wblock.data.section.opt_comment = NULL; + wblock.data.section.shb_hardware = NULL; + wblock.data.section.shb_os = NULL; + wblock.data.section.shb_user_appl = NULL; /* read the block */ bytes_read = pcapng_read_block(wth->random_fh, FALSE, pcapng, &wblock, err, err_info); |