Wireshark-commits: [Wireshark-commits] master-1.12 b626319: Don't assume we have an array of GeoIP

Date Prev · Date Next · Thread Prev · Thread Next
Date Index · Thread Index · Other Months · All Mailing Lists
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Sun, 19 Jun 2016 22:19:47 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=b626319fa90efeaa56767731657392fdc4716843
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-1.12
Repository: wireshark

Commits:

b626319 by Guy Harris (guy@xxxxxxxxxxxx):

    Don't assume we have an array of GeoIP databases.
    
    The attempt to open them might fail; if geoip_dat_arr is null, just
    return 0 as the number of databases, don't crash.
    
    Change-Id: I967d863d328a42d7dce79f58d4fa67d922d0cb2c
    Reviewed-on: https://code.wireshark.org/review/16025
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    (cherry picked from commit 30919f7708a40ac536da07e6157e0f2ec250abe6)
    Reviewed-on: https://code.wireshark.org/review/16027
    

Actions performed:

    from  5392079   [Automatic update for 2016-06-19]
    adds  b626319   Don't assume we have an array of GeoIP databases.


Summary of changes:
 epan/geoip_db.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)