From 82b03128872e14051e483fd953a469cea7ac2e91 Mon Sep 17 00:00:00 2001 From: Vasil Velichkov Date: Tue, 12 Mar 2019 01:12:14 +0200 Subject: [PATCH] dumpcap: Reallocate the IO buffer when switching the ring buffer files Fixes ASAN test failures for 4 suite_capture tests. Fixes: v3.1.0rc0-261-ga55111610a ("Dumpcap: Set a bigger IO buffer(64KiB).") Change-Id: If7b9450915af0ea751240acbde2371afa806f701 Reviewed-on: https://code.wireshark.org/review/32398 Reviewed-by: Peter Wu Petri-Dish: Peter Wu Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- ringbuffer.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ringbuffer.c b/ringbuffer.c index 1251ed3057..08b9fbe311 100644 --- a/ringbuffer.c +++ b/ringbuffer.c @@ -133,6 +133,7 @@ ringbuf_init(const char *capfile_name, guint num_files, gboolean group_read_acce rb_data.unlimited = FALSE; rb_data.fd = -1; rb_data.pdh = NULL; + rb_data.io_buffer = NULL; rb_data.group_read_access = group_read_access; /* just to be sure ... */ @@ -241,8 +242,8 @@ ringbuf_init_libpcap_fdopen(int *err) } } #endif - /* Increase the size of the IO bubffer */ - rb_data.io_buffer = (char *)g_malloc(buffsize); + /* Increase the size of the IO buffer */ + rb_data.io_buffer = (char *)g_realloc(rb_data.io_buffer, buffsize); setvbuf(rb_data.pdh, rb_data.io_buffer, _IOFBF, buffsize); }