diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-03-01 20:01:17 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-03-02 04:01:43 +0000 |
| commit | 99ceab898c8c809eb1584432c54872d7e368711b (patch) | |
| tree | da093a3560015e3e18d311d607343a7956c9701e /ui/qt/packet_dialog.cpp | |
| parent | 3108bf8d2ec57fe091a69d3f96b1f356964df41f (diff) | |
Don't create a packet dialog if we don't have a packet.
Move the "find the frame" stuff to openPacketDialog(), and don't even
bother creating a new PacketDialog if we don't find the frame. This
should squelch Coverity CID 1270934, by giving up quickly if fdata is
null.
Change-Id: I4605ba7e271a55724f02cafed4122f9dd9b1b6f7
Reviewed-on: https://code.wireshark.org/review/7467
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'ui/qt/packet_dialog.cpp')
| -rw-r--r-- | ui/qt/packet_dialog.cpp | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/ui/qt/packet_dialog.cpp b/ui/qt/packet_dialog.cpp index c5c9fc7e33..0ac7592f83 100644 --- a/ui/qt/packet_dialog.cpp +++ b/ui/qt/packet_dialog.cpp @@ -42,7 +42,7 @@ // - Copy over experimental packet editing code. // - Fix ElidedText width. -PacketDialog::PacketDialog(QWidget &parent, CaptureFile &cf, bool from_reference) : +PacketDialog::PacketDialog(QWidget &parent, CaptureFile &cf, frame_data *fdata) : WiresharkDialog(parent, cf), ui(new Ui::PacketDialog), packet_data_(NULL) @@ -53,16 +53,6 @@ PacketDialog::PacketDialog(QWidget &parent, CaptureFile &cf, bool from_reference // XXX Use recent settings instead resize(parent.width() * 4 / 5, parent.height() * 4 / 5); - frame_data * fdata = cap_file_.capFile()->current_frame; - - if(from_reference) { - guint32 framenum = fvalue_get_uinteger(&(cap_file_.capFile()->finfo_selected->value)); - if (framenum < 1) reject(); - - fdata = frame_data_sequence_find(cap_file_.capFile()->frames, framenum); - } - if (!fdata) reject(); - setWindowSubtitle(tr("Packet %1").arg(fdata->num)); phdr_ = cap_file_.capFile()->phdr; |