Wireshark-commits: [Wireshark-commits] master-1.12 769dd52: Don't assume file_read() won't itself r

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Tue, 12 May 2015 19:49:49 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=769dd52cde690f4b2562ed05cbc300135679015c
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-1.12
Repository: wireshark

Commits:

769dd52 by Guy Harris (guy@xxxxxxxxxxxx):

    Don't assume file_read() won't itself return WTAP_ERR_SHORT_READ.
    
    There are some paths where it will.
    
    Change-Id: Ic086fc8160a69b433f8acafd4e387cf9a0c8b38c
    Reviewed-on: https://code.wireshark.org/review/8434
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  986a41a   Backport some parts of Ia5dba2a6f81151e87b614461349d611cffc16210.
    adds  769dd52   Don't assume file_read() won't itself return WTAP_ERR_SHORT_READ.


Summary of changes:
 wiretap/logcat.c |   13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)