Wireshark-commits: [Wireshark-commits] master-1.12 a554098: Remove epan member from PacketWinData a
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: Sun, 5 Apr 2015 12:26:17 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=a554098547933658e5b372bd316497135fbda846
Submitter: Michael Mann (mmann78@xxxxxxxxxxxx)
Changed: branch: master-1.12
Repository: wireshark

Commits:

a554098 by Michael Mann (mmann78@xxxxxxxxxxxx):

    Remove epan member from PacketWinData and just use cfile.epan when redissecting a packet window.
    
    A pointer to cfile.epan was saved by the window when it's created, but any redissection will remove the epan_session used by cfile.epan underneath the window, so let's just use cfile.epan directly.
    
    Bug: 11043
    Change-Id: Ie6b85708025f8ab7d5e5dc48ad99fee0931af472
    Reviewed-on: https://code.wireshark.org/review/7915
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    Petri-Dish: Michael Mann <mmann78@xxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    (cherry picked from commit 8699bc285819244aca8c580e8aebd7780148fedd)
    Reviewed-on: https://code.wireshark.org/review/7919
    

Actions performed:

    from  07d0d04   Some CANopen frame types can have zero size, so use tvb_reported_length instead of -1.
    adds  a554098   Remove epan member from PacketWinData and just use cfile.epan when redissecting a packet window.


Summary of changes:
 ui/gtk/packet_win.c |   12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)