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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=d9f4d37c518720bb76d31aca4ed957b9c27636cb
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-1.12
Repository: wireshark

Commits:

d9f4d37 by Michael Tüxen (tuexen@xxxxxxxxxxxxx):

    The subtype_seek_read() functions populate *phdr, not wth->phdr.
    So don't use the values.
    This problem show up on pcapng files resulting from captures of
    multiple interfaces.
    
    Change-Id: I30b0598602b0b69233107d35be4360475d8648d8
    Reviewed-on: https://code.wireshark.org/review/1950
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    (cherry picked from commit 91afb5a36ed9f3fb0056ac3f9aff5d5eda22ba01)
    Reviewed-on: https://code.wireshark.org/review/1951
    

Actions performed:

    from  e4cb1a6   MBIM: do not access to hash map when it is not initialized yet
    adds  d9f4d37   The subtype_seek_read() functions populate *phdr, not wth->phdr. So don't use the values. This problem show up on pcapng files resulting from captures of multiple interfaces.


Summary of changes:
 wiretap/wtap.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)