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 /acinclude.m4 | |
| parent | 90afc2582b4cd5a8ae75dcb9f6e19330a28aa5f9 (diff) | |
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 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index ee172ef470..11c657fd87 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1122,6 +1122,11 @@ AC_DEFUN([AC_WIRESHARK_GEOIP_CHECK], AC_DEFINE(HAVE_GEOIP_V6, 1, [Define if GeoIP supports IPv6 (GeoIP 1.4.5 and later)]) ],, ) + AC_CHECK_LIB(GeoIP, GeoIP_free, + [ + AC_DEFINE(HAVE_GEOIP_FREE, 1, [Define if GeoIP has GeoIP_free (not available upstream with 1.6.10 or earlier)]) + ],, + ) fi else AC_MSG_RESULT(not required) |