diff options
| author | Anders Broman <a.broman58@gmail.com> | 2014-03-20 12:22:39 +0000 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-03-20 12:25:21 +0000 |
| commit | 0513b29b8b61dba15b7f8c23d9304938206e71fb (patch) | |
| tree | d7178277a7e645c222a52ded482a88962bcf3262 /wiretap/wtap.c | |
| parent | 7b13a3b0f6a5617e0e352f87cc5a20afea226aa8 (diff) | |
| download | wireshark-0513b29b8b61dba15b7f8c23d9304938206e71fb.tar.gz | |
Revert "Allow pcapng interface options to be available to dissectors."
This patch causes Wireshark/tshark to segfault if the file is reread(open a file and press reload).
The test suite also fails on
2.1.1 Step: Exit status for existing file: "/home/wireshark/builders/trunk/sol10sparc/build/test/captures/dhcp.pcap" must be 0/home/wireshark/builders/trunk/sol10sparc/build/test/suite-clopts.sh: line 149: 6646 Segmentation Fault (core dumped) $TSHARK -r "${CAPTURE_DIR}dhcp.pcap" > ./testout.txt 2>&1
OSX build bot chokes on
pcapng.c: In function 'pcapng_destroy_option_value':
pcapng.c:377: warning: implicit declaration of function 'g_byte_array_unref'
pcapng.c:379: warning: implicit declaration of function 'g_array_unref'
pcapng.c: In function 'pcapng_collect_block_option':
pcapng.c:419: warning: implicit declaration of function 'g_byte_array_new_take'
pcapng.c:419: warning: initialization makes pointer from integer without a cast
these functions are glib 2.22
This reverts commit 7b13a3b0f6a5617e0e352f87cc5a20afea226aa8.
Change-Id: Ia82fdb2d08287bc2cd2841e1e941ae68cbc2e009
Reviewed-on: https://code.wireshark.org/review/749
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'wiretap/wtap.c')
| -rw-r--r-- | wiretap/wtap.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/wiretap/wtap.c b/wiretap/wtap.c index d8bbdbb65f..8774f35e1f 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -925,9 +925,6 @@ wtap_close(wtap *wth) if(wtapng_if_descr->num_stat_entries != 0){ g_array_free(wtapng_if_descr->interface_statistics, TRUE); } - if(wtapng_if_descr->if_options){ - g_hash_table_destroy(wtapng_if_descr->if_options); - } } if(wth->number_of_interfaces != 0){ g_array_free(wth->interface_data, TRUE); |