From 988b14ad727e0b9711089f67bc4b4df2f933b757 Mon Sep 17 00:00:00 2001 From: Jakub Zawadzki Date: Mon, 8 Oct 2018 22:50:41 +0200 Subject: [PATCH] sharkd: free initalized wtap_rec when wtap failed to read frame. Change-Id: I564a3704c0ea1b0df85f3cafacf790ed24591232 Reviewed-on: https://code.wireshark.org/review/30086 Petri-Dish: Jakub Zawadzki Tested-by: Petri Dish Buildbot Reviewed-by: Jakub Zawadzki --- sharkd.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sharkd.c b/sharkd.c index 569bfc7681..bc35ced1f4 100644 --- a/sharkd.c +++ b/sharkd.c @@ -544,6 +544,7 @@ sharkd_dissect_request(guint32 framenum, guint32 frame_ref_num, guint32 prev_dis ws_buffer_init(&buf, 1500); if (!wtap_seek_read(cfile.provider.wth, fdata->file_off, &rec, &buf, &err, &err_info)) { + wtap_rec_cleanup(&rec); ws_buffer_free(&buf); return -1; /* error reading the record */ } @@ -604,6 +605,7 @@ sharkd_dissect_columns(frame_data *fdata, guint32 frame_ref_num, guint32 prev_di if (!wtap_seek_read(cfile.provider.wth, fdata->file_off, &rec, &buf, &err, &err_info)) { col_fill_in_error(cinfo, fdata, FALSE, FALSE /* fill_fd_columns */); + wtap_rec_cleanup(&rec); ws_buffer_free(&buf); return -1; /* error reading the record */ }