Wireshark-commits: [Wireshark-commits] master-2.6 c1fb20a: Qt: fix crash on opening a capture file
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=c1fb20adc733f364ca1315caba147925b75a1bc3
Submitter: Peter Wu (peter@xxxxxxxxxxxxx)
Changed: branch: master-2.6
Repository: wireshark
Commits:
c1fb20a by Peter Wu (peter@xxxxxxxxxxxxx):
Qt: fix crash on opening a capture file while loading/saving another
Closing a capture file while it is being loaded will result in a crash.
As a workaround, disallow closing the capture file. The requested action
(e.g. MainWindow::openCaptureFile) will be silently ignored.
While at it, protect process_specified_records (called when saving
files) similarly to cf_read and fix a crash that occurs when a capture
from the Capture Dialog is started while a file is being loaded:
file.c:360:cf_close: assertion failed: (cf->state != FILE_READ_IN_PROGRESS)
Bug: 10870 # moving rapidly between large files in a file set
Bug: 13594 # start capture while loading/saving file
Bug: 14351 # open another file while loading file
Change-Id: I6ce8f3163c3fa4869f0299e49909a32594326ce4
Reviewed-on: https://code.wireshark.org/review/28541
Petri-Dish: Anders Broman <a.broman58@xxxxxxxxx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
(cherry picked from commit 536e26c55ecd89825855b14b7edd9899dfe6a78c)
Reviewed-on: https://code.wireshark.org/review/28578
Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
Actions performed:
from 16d1112 file: fix packet list update after dfilter change during live capture
adds c1fb20a Qt: fix crash on opening a capture file while loading/saving another
Summary of changes:
file.c | 9 +++++++++
ui/qt/main_window.cpp | 12 ++++++++++++
ui/qt/main_window_slots.cpp | 18 ++++++++++++++----
3 files changed, 35 insertions(+), 4 deletions(-)
