Module: check_mk Branch: master Commit: 9ffc17af3f1af463da47ac772b9e8da3699c69ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ffc17af3f1af4… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Oct 29 17:41:39 2015 +0100 fixed a crash in the windows agent when starting without argumenst --- agents/windows/Makefile | 2 ++ agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 829952 -> 829952 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 829952 -> 829952 bytes agents/windows/check_mk_agent.cc | 14 ++++++++------ agents/windows/check_mk_agent.exe | Bin 748032 -> 748032 bytes agents/windows/check_mk_agent.msi | Bin 1835520 -> 1835520 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 748032 -> 748032 bytes agents/windows/install_agent-64.exe | Bin 383027 -> 383088 bytes agents/windows/install_agent.exe | Bin 373952 -> 373956 bytes 10 files changed, 11 insertions(+), 7 deletions(-) diff --git a/agents/windows/Makefile b/agents/windows/Makefile index 011d7d5..67c21e1 100644 --- a/agents/windows/Makefile +++ b/agents/windows/Makefile @@ -28,6 +28,8 @@ VERSION = 1.2.7i4 VERSION_DUMMY = @@@@@CHECK_MK_VERSION@@@@@ WINDRES = i686-w64-mingw32-windres COPTIONS = -s -O2 -Wall -Werror -static -static-libgcc -static-libstdc++ -fno-rtti -DCHECK_MK_VERSION='"$(VERSION_DUMMY)"' -D__USE_MINGW_ANSI_STDIO +# for debug builds +# COPTIONS = -O0 -Wall -Werror -static -static-libgcc -static-libstdc++ -fno-rtti -ggdb -DCHECK_MK_VERSION='"$(VERSION_DUMMY)"' -D__USE_MINGW_ANSI_STDIO MKDIR = mkdir -p ifeq ($(shell uname),Linux) diff --git a/agents/windows/build_version b/agents/windows/build_version index cb3e25b..212abf5 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -609 +618 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 816438a..6a2cf2a 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index b3263c8..557f849 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 7e9a5ba..1afedc5 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -3682,13 +3682,15 @@ void cleanup() unregister_all_eventlogs(); // frees a few bytes - for (fileinfo_paths_t::iterator it_path = g_config->fileinfoPaths().begin(); - it_path != g_config->fileinfoPaths().end(); it_path++) { - free(*it_path); - } - g_config->fileinfoPaths().clear(); + if (g_config != NULL) { + for (fileinfo_paths_t::iterator it_path = g_config->fileinfoPaths().begin(); + it_path != g_config->fileinfoPaths().end(); it_path++) { + free(*it_path); + } + g_config->fileinfoPaths().clear(); - cleanup_logwatch(); + cleanup_logwatch(); + } } void show_version() diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index b09b44b..096dbf8 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index 20e216b..79cc655 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index 95f9956..7996e3a 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 88dec84..a5f67dc 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 6f2937d..12e980d 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ