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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=1900d9e6d56b551f01c8dc83d5022184bd4ee171
Submitter: "Peter Wu <peter@xxxxxxxxxxxxx>"
Changed: branch: master-2.4
Repository: wireshark

Commits:

1900d9e by Peter Wu (peter@xxxxxxxxxxxxx):

    ftype-protocol: do not return from TRY/CATCH
    
    TRY/CATCH are macros, before returning the ENDTRY block must be executed
    or the weirdest crashes can occur.
    
    Change-Id: Ic56871322f8567263e2b8a81cce5a3c7042301b7
    Fixes: v2.1.0rc0-2939-g5493fe0167 ("Convert ftype-tvbuff.c to ftype-protocol.c")
    Reviewed-on: https://code.wireshark.org/review/30095
    Petri-Dish: Peter Wu <peter@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    (cherry picked from commit 8c31cdc13c546107235b86cfa9a539c436448f2e)
    Reviewed-on: https://code.wireshark.org/review/30110
    Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
    

Actions performed:

    from  baa2e30   Tweak ws_cpuid so that Valgrind is happy.
     add  1900d9e   ftype-protocol: do not return from TRY/CATCH


Summary of changes:
 epan/ftypes/ftype-protocol.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)