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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=5504228ad7a3be4460b1175230028be9523df825
Submitter: "Guy Harris <guy@xxxxxxxxxxxx>"
Changed: branch: master-2.6
Repository: wireshark

Commits:

5504228 by Guy Harris (guy@xxxxxxxxxxxx):

    In pcapng_open(), don't use the local pcapng_t once we know it's a pcapng file.
    
    Use the local one *only* while we're trying to determine whether we have
    a pcapng file or not; once we know we have a pcapng file, and have
    allocated a pcapng_t and attached it to the wtap structure, pass *that*
    one to pcapng_read_block(), so if it changes anything in the pcapng_t,
    it changes the one we're using.
    
    Change-Id: I53b32595276be97957a0b6056171471878fa40c4
    Reviewed-on: https://code.wireshark.org/review/33226
    Petri-Dish: Guy Harris <guy@xxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    (cherry picked from commit 576f33fffd4384d869ae516aa3f346d2ce0b4c6b)
    Reviewed-on: https://code.wireshark.org/review/33228
    

Actions performed:

    from  38a48c3   Keep and use per-interface, not per-file, FCS length information.
     add  5504228   In pcapng_open(), don't use the local pcapng_t once we know it's a pcapng file.


Summary of changes:
 wiretap/pcapng.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)