diff options
| author | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-01-20 23:33:38 +0000 |
|---|---|---|
| committer | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-01-20 23:33:38 +0000 |
| commit | c8a54b6a6e8fe681b2a7ea3895d90e6860d48265 (patch) | |
| tree | 65c68e7ce6a86019d6573e318a64517dbf060031 | |
| parent | e43ebf0e828b33159c3e8242d8e9ef9e00ea2d4d (diff) | |
Use the correct data type for the range string in the Win32 file dialog.
Have value_is_in_range() to gracefully handle a NULL range. This might
fix bug 3208.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@27281 f5534014-38df-0310-8fa8-9805f1628bb7
| -rw-r--r-- | epan/range.c | 8 | ||||
| -rw-r--r-- | gtk/file_dlg_win32.c | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/epan/range.c b/epan/range.c index 16059f6ce5..96745f3cb1 100644 --- a/epan/range.c +++ b/epan/range.c @@ -245,9 +245,11 @@ gboolean value_is_in_range(range_t *range, guint32 val) { guint i; - for (i=0; i < range->nranges; i++) { - if (val >= range->ranges[i].low && val <= range->ranges[i].high) - return TRUE; + if (range) { + for (i=0; i < range->nranges; i++) { + if (val >= range->ranges[i].low && val <= range->ranges[i].high) + return TRUE; + } } return(FALSE); } diff --git a/gtk/file_dlg_win32.c b/gtk/file_dlg_win32.c index ea1e38ec88..c66b6feb4b 100644 --- a/gtk/file_dlg_win32.c +++ b/gtk/file_dlg_win32.c @@ -1545,7 +1545,7 @@ range_handle_wm_initdialog(HWND dlg_hwnd, packet_range_t *range) { static void range_handle_wm_command(HWND dlg_hwnd, HWND ctrl, WPARAM w_param, packet_range_t *range) { HWND cur_ctrl; - gchar range_text[RANGE_TEXT_MAX]; + TCHAR range_text[RANGE_TEXT_MAX]; switch(w_param) { case (BN_CLICKED << 16) | EWFD_CAPTURED_BTN: @@ -1595,7 +1595,7 @@ range_handle_wm_command(HWND dlg_hwnd, HWND ctrl, WPARAM w_param, packet_range_t break; case (EN_CHANGE << 16) | EWFD_RANGE_EDIT: SendMessage(ctrl, WM_GETTEXT, (WPARAM) RANGE_TEXT_MAX, (LPARAM) range_text); - packet_range_convert_str(range, utf_16to8((unsigned short *) range_text)); + packet_range_convert_str(range, utf_16to8(range_text)); range_update_dynamics(dlg_hwnd, range); break; } |