URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=3576394ed4fc782ce5a2151c88c5a10b37cb3393
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master
Repository: wireshark
Commits:
3576394 by Martin Kaiser (wireshark@xxxxxxxxx):
interface_sort_filter_model: don't dereference a NULL pointer
This fixes a crash in InterfaceSortFilterModel::mapToSource().
sourceModel was set to match the sourceModel of the underlying
InterfaceFrame. When Wireshark is closed,
InterfaceSortFilterModel::mapToSource() is called after
InterfaceFrame was freed, the sourceModel is NULL in this case.
#0 0x000000000079a81e in InterfaceSortFilterModel::mapToSource
(this=0xe9fab0, proxyIndex=...)
/home/martin/src/wireshark.git/ui/qt/interface_sort_filter_model.cpp:250
...
#7 0x0000000000797ed9 in InterfaceTreeModel::~InterfaceTreeModel
(this=0xe9ff90, __in_chrg=<optimized out>)
at /home/martin/src/wireshark.git/ui/qt/interface_tree_model.cpp:72
#8 0x00000000006c4e20 in InterfaceFrame::~InterfaceFrame
(this=0xe643b0, __in_chrg=<optimized out>)
at /home/martin/src/wireshark.git/ui/qt/interface_frame.cpp:109
#9 0x00000000006c4ec9 in InterfaceFrame::~InterfaceFrame
(this=0xe643b0, __in_chrg=<optimized out>)
at /home/martin/src/wireshark.git/ui/qt/interface_frame.cpp:112
Change-Id: Ibe7f75ccd7a0af5f04febf967c47ada1a05bc3d3
Reviewed-on: https://code.wireshark.org/review/18411
Reviewed-by: Martin Kaiser <wireshark@xxxxxxxxx>
Petri-Dish: Martin Kaiser <wireshark@xxxxxxxxx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
Actions performed:
from 892246a diameter: improvement of AVP 1066
adds 3576394 interface_sort_filter_model: don't dereference a NULL pointer
Summary of changes:
ui/qt/interface_sort_filter_model.cpp | 3 +++
1 file changed, 3 insertions(+)