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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=666beef78f8c3fc6b7faf3510e0dbfcd5f2ddfd2
Submitter: Balint Reczey (balint@xxxxxxxxxxxxxxx)
Changed: branch: lts-1.12.1
Repository: wireshark

Commits:

666beef by Guy Harris (guy@xxxxxxxxxxxx):

    Backport some parts of Ia5dba2a6f81151e87b614461349d611cffc16210.
    
    This should make sure logcat_open() doesn't report an error for a file
    that's not a logcat file, preventing other heuristic open routines from
    checking the file.
    
    Change-Id: I4c042459550f6d27f40a76f103d95a7f4e317969
    Reviewed-on: https://code.wireshark.org/review/8432
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    Conflicts: wiretap/logcat.c
    Reviewed-on: https://code.wireshark.org/review/8644
    Reviewed-by: Balint Reczey <balint@xxxxxxxxxxxxxxx>
    

Actions performed:

    from  22c2210   logcat: improve (crash) robustness, improve names
    adds  666beef   Backport some parts of Ia5dba2a6f81151e87b614461349d611cffc16210.


Summary of changes:
 wiretap/logcat.c |  113 +++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 74 insertions(+), 39 deletions(-)