diff options
author | Pascal Quantin <pascal.quantin@gmail.com> | 2015-12-11 17:43:35 +0100 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2015-12-12 23:49:50 +0000 |
commit | f06bbe37c12c7788702cc8649e3da1f18c730931 (patch) | |
tree | 191ac2d45c0f3638e6b0ca705822b1ea30c32af0 /ui/qt/import_text_dialog.h | |
parent | 5133221a1929ce0bc903c64cf340e2fc5d08a9dc (diff) | |
download | wireshark-f06bbe37c12c7788702cc8649e3da1f18c730931.tar.gz |
Qt: validate format string before calling strftime()
According to https://msdn.microsoft.com/en-us/library/fe06s4ak.aspx
an invalid string will trigger invalid parameter handler
Also check the validity of each field before activating import button
Bug: 11873
Change-Id: I9fc1c6e061a02354690871410f0e2cf2e0dd86a7
Reviewed-on: https://code.wireshark.org/review/12537
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'ui/qt/import_text_dialog.h')
-rw-r--r-- | ui/qt/import_text_dialog.h | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/ui/qt/import_text_dialog.h b/ui/qt/import_text_dialog.h index eeb79b47bc..c06a6df0fe 100644 --- a/ui/qt/import_text_dialog.h +++ b/ui/qt/import_text_dialog.h @@ -52,14 +52,25 @@ public: private: void convertTextFile(); void enableHeaderWidgets(bool enable_buttons = true); - void check_line_edit(SyntaxLineEdit *le, const QString &num_str, int base, guint max_val, bool is_short, guint *val_ptr); + void check_line_edit(SyntaxLineEdit *le, bool &ok_enable, const QString &num_str, int base, guint max_val, bool is_short, guint *val_ptr); + bool checkDateTimeFormat(const QString &time_format); + void updateImportButtonState(); Ui::ImportTextDialog *ti_ui_; - QPushButton *ok_button_; + QPushButton *import_button_; QList<QRadioButton *>encap_buttons_; text_import_info_t import_info_; QString capfile_name_; + bool file_ok_; + bool time_format_ok_; + bool ether_type_ok_; + bool proto_ok_; + bool source_port_ok_; + bool dest_port_ok_; + bool tag_ok_; + bool ppi_ok_; + bool max_len_ok_; public slots: int exec(); |