Wireshark-commits: [Wireshark-commits] master-2.2 97b1d53: Don't crash in manually_resolve_cleanup(
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Sat, 03 Mar 2018 08:08:36 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=97b1d53d0612f961100fd8a6e36af0b244b1699d
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-2.2
Repository: wireshark

Commits:

97b1d53 by Guy Harris (guy@xxxxxxxxxxxx):

    Don't crash in manually_resolve_cleanup() if there's nothing to clean up.
    
    We might not yet have allocated the manually-resolved address lists;
    only free the if we have.
    
    Change-Id: Iff9864e397a04cdcb613268603c073ecd1fa77fb
    Reviewed-on: https://code.wireshark.org/review/26236
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    (cherry picked from commit 302fa6881751e5a8f9c8c197ab0008ee336e821a)
    Reviewed-on: https://code.wireshark.org/review/26238
    

Actions performed:

    from  f927769   mp4: limit the recursion depth for boxes
    adds  97b1d53   Don't crash in manually_resolve_cleanup() if there's nothing to clean up.


Summary of changes:
 epan/addr_resolv.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)