Wireshark · Wireshark-commits: [Wireshark-commits] master e85c8be: tshark: fix crash with -Tjson and -e field

[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=e85c8bed87821e75965fca093294c23d12ac4b21
Submitter: "Anders Broman <a.broman58@xxxxxxxxx>"
Changed: branch: master
Repository: wireshark

Commits:

e85c8be by Peter Wu (peter@xxxxxxxxxxxxx):

    tshark: fix crash with -Tjson and -e field
    
    Fix the assertion to check for the actual requirements. Add tests for -T
    combined with -e.
    
    Bug: 15444
    Change-Id: I83e7663572db0c60194f6d6128b9e1ae7396b3f6
    Fixes: v2.9.1rc0-226-g30c90fa745 ("epan: use json_dumper for json outputs.")
    Reviewed-on: https://code.wireshark.org/review/31724
    Petri-Dish: Peter Wu <peter@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  d3f1e2f   smb2: cleanup
     add  e85c8be   tshark: fix crash with -Tjson and -e field


Summary of changes:
 epan/print.c                |  9 +++++--
 test/suite_outputformats.py | 60 ++++++++++++++++++++++++++++++++++-----------
 2 files changed, 53 insertions(+), 16 deletions(-)