Wireshark-commits: [Wireshark-commits] master-1.12 92483af: WCCP: Fix up storing and decoding of IP
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Fri, 5 Jun 2015 00:34:11 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=92483afff4394a7949667d5176bd038195c0422e
Submitter: Jeff Morriss (jeff.morriss.ws@xxxxxxxxx)
Changed: branch: master-1.12
Repository: wireshark

Commits:

92483af by Jeff Morriss (jeff.morriss.ws@xxxxxxxxx):

    WCCP: Fix up storing and decoding of IP addresses.
    
    Try to decode as many IP addresses as we can, even if they don't fit in the
    table we store them in.
    
    Only add IP addresses in the table once.  We could theoretically reallocate
    the table but the original code seems to assume the addresses should (in
    non-fuzzed captures) only show up once per PDU.  This part of the change fixes
    the fuzz failure.
    
    Bug: 11153
    Change-Id: I56b9854ac1342080c9f32699a3f97750fa335696
    Reviewed-on: https://code.wireshark.org/review/8748
    Petri-Dish: Jeff Morriss <jeff.morriss.ws@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    (cherry picked from commit 524ed1df6e6126cd63ba419ccb82c83636d77ee4)
    Conflicts:
    	epan/dissectors/packet-wccp.c
    Reviewed-on: https://code.wireshark.org/review/8770
    Reviewed-by: Jeff Morriss <jeff.morriss.ws@xxxxxxxxx>
    

Actions performed:

    from  f683fc7   MIME Multipart: fix display of the last IMF field
    adds  92483af   WCCP: Fix up storing and decoding of IP addresses.


Summary of changes:
 epan/dissectors/packet-wccp.c |  138 ++++++++++++++++++-----------------------
 1 file changed, 62 insertions(+), 76 deletions(-)