[checkmk-commits] 4006 FIX Windows Agent: Fixed possible memory leak when using logwatch with vista api setting

Module: check_mk Branch: master Commit: 066f93192892e85c87cfd40e8cc1b8b4340cf364 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=066f93192892e8… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Dec 21 10:38:38 2016 +0100 4006 FIX Windows Agent: Fixed possible memory leak when using logwatch with vista api setting Change-Id: I757dbc44cdfee28fce120923f564da69295424da --- .werks/4006 | 9 +++++++++ ChangeLog | 1 + agents/windows/EventLogVista.cc | 1 + agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1326592 -> 1326592 bytes agents/windows/check_mk_agent-64.unstripped.exe | Bin 15505551 -> 15505551 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1326592 -> 1326592 bytes agents/windows/check_mk_agent.exe | Bin 1302528 -> 1302528 bytes agents/windows/check_mk_agent.msi | Bin 2898944 -> 2898944 bytes agents/windows/check_mk_agent.unstripped.exe | Bin 13405932 -> 13405932 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1302528 -> 1302528 bytes agents/windows/install_agent-64.exe | Bin 585694 -> 585677 bytes agents/windows/install_agent.exe | Bin 582519 -> 582548 bytes 13 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/4006 b/.werks/4006 new file mode 100644 index 0000000..9c92fe5 --- /dev/null +++ b/.werks/4006 @@ -0,0 +1,9 @@ +Title: Windows Agent: Fixed possible memory leak when using logwatch with vista api setting +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i4 +Date: 1482313070 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 7b1c519..1e0e270 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,7 @@ * 4208 FIX: mk_jolokia: Plugin now works with jolokia versions requiring the base url to finish with a slash... * 4174 FIX: added missing perfometer for interface services * 4119 FIX: check_mk_agent.solaris: fixed run_cached function... + * 4006 FIX: Windows Agent: Fixed possible memory leak when using logwatch with vista api setting Multisite: * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings.... diff --git a/agents/windows/EventLogVista.cc b/agents/windows/EventLogVista.cc index 91f018e..ee200a8 100644 --- a/agents/windows/EventLogVista.cc +++ b/agents/windows/EventLogVista.cc @@ -244,6 +244,7 @@ public: std::replace_if(result.begin(), result.end(), [](wchar_t ch) { return ch == '\n' || ch == '\r'; }, ' '); + _evt->close(publisher_meta); return result; } }; diff --git a/agents/windows/build_version b/agents/windows/build_version index 0ed0ea4..811f4e3 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -2190 +2193 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index d086565..87ba09f 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.unstripped.exe b/agents/windows/check_mk_agent-64.unstripped.exe index 827c631..7fc7774 100755 Binary files a/agents/windows/check_mk_agent-64.unstripped.exe and b/agents/windows/check_mk_agent-64.unstripped.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index 0f8047c..27ec82b 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.exe b/agents/windows/check_mk_agent.exe index bbcf6b9..ad56930 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 a71fbb0..7f4969a 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.unstripped.exe b/agents/windows/check_mk_agent.unstripped.exe index 92d3ae7..7fd04ea 100755 Binary files a/agents/windows/check_mk_agent.unstripped.exe and b/agents/windows/check_mk_agent.unstripped.exe differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index b566d1c..9526051 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 8aaf204..60cc69f 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 ba8a687..7a8cca9 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ