forked from osmocom/wireshark
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>
This commit is contained in:
parent
90afc2582b
commit
74784bdb3e
|
@ -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_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
|
fi
|
||||||
else
|
else
|
||||||
AC_MSG_RESULT(not required)
|
AC_MSG_RESULT(not required)
|
||||||
|
|
|
@ -45,6 +45,7 @@ IF(GEOIP_FOUND)
|
||||||
SET(CMAKE_REQUIRED_INCLUDES ${GEOIP_INCLUDE_DIRS})
|
SET(CMAKE_REQUIRED_INCLUDES ${GEOIP_INCLUDE_DIRS})
|
||||||
SET(CMAKE_REQUIRED_LIBRARIES ${GEOIP_LIBRARIES})
|
SET(CMAKE_REQUIRED_LIBRARIES ${GEOIP_LIBRARIES})
|
||||||
CHECK_FUNCTION_EXISTS("GeoIP_country_name_by_ipnum_v6" HAVE_GEOIP_V6)
|
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_INCLUDES "")
|
||||||
SET(CMAKE_REQUIRED_LIBRARIES "")
|
SET(CMAKE_REQUIRED_LIBRARIES "")
|
||||||
if (WIN32)
|
if (WIN32)
|
||||||
|
|
|
@ -67,6 +67,9 @@
|
||||||
/* Define if GeoIP supports IPv6 (GeoIP 1.4.5 and later) */
|
/* Define if GeoIP supports IPv6 (GeoIP 1.4.5 and later) */
|
||||||
#cmakedefine HAVE_GEOIP_V6 1
|
#cmakedefine HAVE_GEOIP_V6 1
|
||||||
|
|
||||||
|
/* Define if GeoIP has GeoIP_free (not available upstream with 1.6.10 or earlier) */
|
||||||
|
#cmakedefine HAVE_GEOIP_FREE 1
|
||||||
|
|
||||||
/* Define to 1 if you have the <ifaddrs.h> header file. */
|
/* Define to 1 if you have the <ifaddrs.h> header file. */
|
||||||
#cmakedefine HAVE_IFADDRS_H 1
|
#cmakedefine HAVE_IFADDRS_H 1
|
||||||
|
|
||||||
|
|
|
@ -48,7 +48,7 @@
|
||||||
/* This needs to match NUM_GEOIP_COLS in hostlist_table.h */
|
/* This needs to match NUM_GEOIP_COLS in hostlist_table.h */
|
||||||
#define MAX_GEOIP_DBS 13
|
#define MAX_GEOIP_DBS 13
|
||||||
|
|
||||||
#ifndef GeoIP_free
|
#ifndef HAVE_GEOIP_FREE
|
||||||
#define GeoIP_free free
|
#define GeoIP_free free
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -99,14 +99,14 @@ Param(
|
||||||
# trouble instead of trying to catch exceptions everywhere.
|
# trouble instead of trying to catch exceptions everywhere.
|
||||||
$ErrorActionPreference = "Stop"
|
$ErrorActionPreference = "Stop"
|
||||||
|
|
||||||
$Win64CurrentTag = "2017-02-15"
|
$Win64CurrentTag = "2017-04-14"
|
||||||
$Win32CurrentTag = "2017-02-15"
|
$Win32CurrentTag = "2017-04-14"
|
||||||
|
|
||||||
# Archive file / subdir.
|
# Archive file / subdir.
|
||||||
$Win64Archives = @{
|
$Win64Archives = @{
|
||||||
"AirPcap_Devpack_4_1_0_1622.zip" = "AirPcap_Devpack_4_1_0_1622";
|
"AirPcap_Devpack_4_1_0_1622.zip" = "AirPcap_Devpack_4_1_0_1622";
|
||||||
"c-ares-1.12.0-1-win64ws.zip" = "";
|
"c-ares-1.12.0-1-win64ws.zip" = "";
|
||||||
"GeoIP-1.6.6-win64ws.zip" = "GeoIP-1.6.6-win64ws";
|
"GeoIP-1.6.10-win64ws.zip" = "";
|
||||||
"gnutls-3.4.11-1.35-win64ws.zip" = "";
|
"gnutls-3.4.11-1.35-win64ws.zip" = "";
|
||||||
"gtk+-bundle_2.24.23-3.39-2_win64ws.zip" = "gtk2";
|
"gtk+-bundle_2.24.23-3.39-2_win64ws.zip" = "gtk2";
|
||||||
"kfw-3-2-2-x64-ws.zip" = "";
|
"kfw-3-2-2-x64-ws.zip" = "";
|
||||||
|
@ -130,7 +130,7 @@ $Win64Archives = @{
|
||||||
$Win32Archives = @{
|
$Win32Archives = @{
|
||||||
"AirPcap_Devpack_4_1_0_1622.zip" = "AirPcap_Devpack_4_1_0_1622";
|
"AirPcap_Devpack_4_1_0_1622.zip" = "AirPcap_Devpack_4_1_0_1622";
|
||||||
"c-ares-1.12.0-1-win32ws.zip" = "";
|
"c-ares-1.12.0-1-win32ws.zip" = "";
|
||||||
"GeoIP-1.6.6-win32ws.zip" = "GeoIP-1.6.6-win32ws";
|
"GeoIP-1.6.10-win32ws.zip" = "";
|
||||||
"gnutls-3.4.11-1.36-win32ws.zip" = "";
|
"gnutls-3.4.11-1.36-win32ws.zip" = "";
|
||||||
"gtk+-bundle_2.24.23-1.1-1_win32ws.zip" = "gtk2";
|
"gtk+-bundle_2.24.23-1.1-1_win32ws.zip" = "gtk2";
|
||||||
"kfw-3-2-2-i386-ws-vc6.zip" = "";
|
"kfw-3-2-2-i386-ws-vc6.zip" = "";
|
||||||
|
|
Loading…
Reference in New Issue