diff options
author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2016-07-13 10:07:16 -0400 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2016-07-13 15:02:08 +0000 |
commit | 3ecbe50af2e904709f805ff6e8f3803842fcfe6f (patch) | |
tree | a181fd934cdb7dd8fbdf7f1228bf4ae1fe2f3225 | |
parent | abd287fcf9f90285869ffd2b259528a1f98bef1d (diff) |
Restore setting data.edt in write_specified_fields().
This prevents tshark from crashing when run with "-T fields -e data".
I5778b08c52119b5be1ec482be9417b3c4ba8ed62 mistakenly removed this line (this
'data' is a write_field_data_t rather than the print_data structure that
change was cleaning up).
Bug: 12616
Change-Id: I773e47f12f852e19a20ec29a43eb3a0953923173
Reviewed-on: https://code.wireshark.org/review/16415
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-rw-r--r-- | epan/print.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/epan/print.c b/epan/print.c index f197b7b7eb..75409f9bc4 100644 --- a/epan/print.c +++ b/epan/print.c @@ -2051,6 +2051,7 @@ static void write_specified_fields(fields_format format, output_fields_t *fields g_assert(fh); data.fields = fields; + data.edt = edt; if (NULL == fields->field_indicies) { /* Prepare a lookup table from string abbreviation for field to its index. */ |