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

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

Commits:

e543818 by Guy Harris (guy@xxxxxxxxxxxx):

    Remove misuse of wtap_file_read_expected_bytes().
    
    wtap_file_read_expected_bytes() is a macro that can return a Boolean
    FALSE; it should not be used in routines that don't return a Boolean.
    
    In addition, both EOF *and* a short read, in that routine, should be
    treated as a "not an IPFIX file" indication.
    
    While we're at it, a seek failure should be treated as an error.
    
    Change-Id: I97815bc9e78169ded567b60835cc7bcf6a0e6f0c
    Reviewed-on: https://code.wireshark.org/review/4261
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  6ebffcc   Make sure the option string pointers are set before freeing them.
    adds  e543818   Remove misuse of wtap_file_read_expected_bytes().


Summary of changes:
 wiretap/ipfix.c |   17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)