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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=536eae48220e94f42739ef1461ffbde63d271f6f
Submitter: "Gerald Combs <gerald@xxxxxxxxxxxxx>"
Changed: branch: master-2.6
Repository: wireshark

Commits:

536eae4 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    mmdbresolve: Improve our main loop check.
    
    Check the return value of fscanf() instead of relying on feof(). This
    should help ensure that we exit correctly.
    
    Bug: 15777
    Change-Id: I8b5985f6015cb6a85378db5135b29bb2c3de1e90
    Reviewed-on: https://code.wireshark.org/review/33196
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    (cherry picked from commit 276d62b639c2dbbe8ada823c2ca714daccbd0ce7)
    Reviewed-on: https://code.wireshark.org/review/33207
    

Actions performed:

    from  2ae17b8   Fix SMB2 decryption on big-endian machines.
     add  536eae4   mmdbresolve: Improve our main loop check.


Summary of changes:
 mmdbresolve.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)