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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=52b0ebc0f50c26f2415075ddc3db67b86d8992c2
Submitter: Pascal Quantin (pascal.quantin@xxxxxxxxx)
Changed: branch: master-1.12
Repository: wireshark

Commits:

52b0ebc by Pascal Quantin (pascal.quantin@xxxxxxxxx):

    TCP: move Windows Scaling and SCPS checks after options decoding
    
    This was changed in g8881f3f in an attempt to avoid throwing an exception when decoding the options field
    
    Bug: 10514
    Change-Id: Ia4b49f484d6255090c5a6e425a9716b48ccc4cb5
    Reviewed-on: https://code.wireshark.org/review/5495
    Reviewed-by: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    (cherry picked from commit e8cda3b1bd17b60aaddd3340faaa22940640e7a6)
    Reviewed-on: https://code.wireshark.org/review/5525
    

Actions performed:

    from  802e300   SMTP: escape ASCII strings printed to COL_INFO
    adds  52b0ebc   TCP: move Windows Scaling and SCPS checks after options decoding


Summary of changes:
 epan/dissectors/packet-tcp.c |   37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)