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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=7802bbb09163e3a91cf68e2ba9ef03dc18c99372
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

7802bbb by Valentin Vidic (Valentin.Vidic@xxxxxxxxx):

    TWAMP: Avoid triggering an infinite recursion
    
    Restore the original dissect_twamp_control and introduce a small
    dissect_twamp_server_greeting to reassemble the TCP packets before
    calling dissect_twamp_control.
    
    Change-Id: I9927bc24bc5e5640bd021a12ba7fd98235fefbfb
    Link: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=14448
    Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=6481
    Reviewed-on: https://code.wireshark.org/review/25951
    Petri-Dish: Jakub Zawadzki <darkjames-ws@xxxxxxxxxxxx>
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  4c9cb52   ftp: calculate bitrate of ft-data session
    adds  7802bbb   TWAMP: Avoid triggering an infinite recursion


Summary of changes:
 epan/dissectors/packet-twamp.c | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)