Wireshark · Wireshark-commits: [Wireshark-commits] master 4420461: Don't assume pcap_read_block() returns the number of bytes read.

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

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

Commits:

4420461 by Guy Harris (guy@xxxxxxxxxxxx):

    Don't assume pcap_read_block() returns the number of bytes read.
    
    Recent changes must have made it not do so in some cases, and
    our current version of file_tell(), unlike ftell() around which the
    older file_tell() was a wrapper, is known to be cheap (ftell() would
    make a system call to get the position).  Just use file_tell() before
    each read.
    
    (Further cleanup is called for.)
    
    Bug: 10568
    Change-Id: Ib92057b2b87ec6eb16fd612bc91baeb668d1e1c7
    Reviewed-on: https://code.wireshark.org/review/4691
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  4a6e313   Don't log warnings if no block-type handlers are registered.
    adds  4420461   Don't assume pcap_read_block() returns the number of bytes read.


Summary of changes:
 wiretap/pcapng.c |   11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)