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 /tools | |
| 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 'tools')
| -rw-r--r-- | tools/win-setup.ps1 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/win-setup.ps1 b/tools/win-setup.ps1 index 99fc23b7e3..56f735365d 100644 --- a/tools/win-setup.ps1 +++ b/tools/win-setup.ps1 @@ -99,14 +99,14 @@ Param( # trouble instead of trying to catch exceptions everywhere. $ErrorActionPreference = "Stop" -$Win64CurrentTag = "2017-02-15" -$Win32CurrentTag = "2017-02-15" +$Win64CurrentTag = "2017-04-14" +$Win32CurrentTag = "2017-04-14" # Archive file / subdir. $Win64Archives = @{ "AirPcap_Devpack_4_1_0_1622.zip" = "AirPcap_Devpack_4_1_0_1622"; "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" = ""; "gtk+-bundle_2.24.23-3.39-2_win64ws.zip" = "gtk2"; "kfw-3-2-2-x64-ws.zip" = ""; @@ -130,7 +130,7 @@ $Win64Archives = @{ $Win32Archives = @{ "AirPcap_Devpack_4_1_0_1622.zip" = "AirPcap_Devpack_4_1_0_1622"; "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" = ""; "gtk+-bundle_2.24.23-1.1-1_win32ws.zip" = "gtk2"; "kfw-3-2-2-i386-ws-vc6.zip" = ""; |