diff options
| author | Guy Harris <guy@alum.mit.edu> | 2012-03-15 21:44:54 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2012-03-15 21:44:54 +0000 |
| commit | 8af620acd7584d022e5c0ca55ebc4852057fc850 (patch) | |
| tree | 2ac86910a8e7082705913278152b739264727fc0 | |
| parent | 6b8234e0011a14c92b41662aee72c3a85d684be2 (diff) | |
Initialize the new num_stat_entries and interface_statistics members of
a wtapng_if_descr_t, so that we don't crash on a close (as is happening
in the buildbot).
Fix up some 4-space tabs.
svn path=/trunk/; revision=41575
| -rw-r--r-- | wiretap/pcapng.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/wiretap/pcapng.c b/wiretap/pcapng.c index cccb12f05b..3610e1d082 100644 --- a/wiretap/pcapng.c +++ b/wiretap/pcapng.c @@ -2076,6 +2076,9 @@ pcapng_open(wtap *wth, int *err, gchar **err_info) int_data.if_os = wblock.data.if_descr.if_os; int_data.if_fcslen = wblock.data.if_descr.if_fcslen; /* XXX if_tsoffset; opt 14 A 64 bits integer value that specifies an offset (in seconds)...*/ + /* Interface statistics */ + int_data.num_stat_entries = 0; + int_data.interface_statistics = NULL; g_array_append_val(wth->interface_data, int_data); wth->number_of_interfaces++; @@ -2131,8 +2134,8 @@ pcapng_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset) pcapng_t *pcapng = (pcapng_t *)wth->priv; int bytes_read; wtapng_block_t wblock; - wtapng_if_descr_t *wtapng_if_descr; - wtapng_if_stats_t if_stats; + wtapng_if_descr_t *wtapng_if_descr; + wtapng_if_stats_t if_stats; pcapng_debug1("pcapng_read: wth->data_offset is initially %" G_GINT64_MODIFIER "u", wth->data_offset); *data_offset = wth->data_offset; @@ -2197,8 +2200,8 @@ pcapng_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset) if_stats.isb_osdrop = wblock.data.if_stats.isb_osdrop; if_stats.isb_usrdeliv = wblock.data.if_stats.isb_usrdeliv; - g_array_append_val(wtapng_if_descr->interface_statistics, if_stats); - wtapng_if_descr->num_stat_entries++; + g_array_append_val(wtapng_if_descr->interface_statistics, if_stats); + wtapng_if_descr->num_stat_entries++; } }else{ /* XXX - improve handling of "unknown" blocks */ |