diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2017-04-14 16:52:10 +0200 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2017-04-14 17:53:09 +0000 |
| commit | 74784bdb3ef60d02f6041f6ec6c3b56e3841a2db (patch) | |
| tree | 472099c4dd8c42c3677e94442bcce2b7abc89f31 /cmake/modules | |
| parent | 90afc2582b4cd5a8ae75dcb9f6e19330a28aa5f9 (diff) | |
| download | wireshark-74784bdb3ef60d02f6041f6ec6c3b56e3841a2db.tar.gz | |
Update Windows binaries to GeoIP 1.6.10 with a local GeoIP_free function
This solves a crash occurring when trying to free memory allocated by
GeoIP (cross-compiled with mingw(32|64)) with MSVC function
Bug: 13598
Change-Id: I757cff13660bd485d7ea91d10660e9bf86404728
Reviewed-on: https://code.wireshark.org/review/21090
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'cmake/modules')
| -rw-r--r-- | cmake/modules/FindGEOIP.cmake | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cmake/modules/FindGEOIP.cmake b/cmake/modules/FindGEOIP.cmake index ce968b70ef..a8e671f4ce 100644 --- a/cmake/modules/FindGEOIP.cmake +++ b/cmake/modules/FindGEOIP.cmake @@ -45,6 +45,7 @@ IF(GEOIP_FOUND) SET(CMAKE_REQUIRED_INCLUDES ${GEOIP_INCLUDE_DIRS}) SET(CMAKE_REQUIRED_LIBRARIES ${GEOIP_LIBRARIES}) CHECK_FUNCTION_EXISTS("GeoIP_country_name_by_ipnum_v6" HAVE_GEOIP_V6) + CHECK_FUNCTION_EXISTS("GeoIP_free" HAVE_GEOIP_FREE) SET(CMAKE_REQUIRED_INCLUDES "") SET(CMAKE_REQUIRED_LIBRARIES "") if (WIN32) |