[checkmk-commits] [FEED-3048] - fixed crash when output contains "out-of-range" UTF-16 chars

Module: check_mk Branch: master Commit: c996562c08bd56b96d6462a8f02d770bdd6222ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c996562c08bd56… Author: Sergey Kipnis &lt;sk(a)mathias-kettner.de&gt; Date: Tue Nov 20 16:58:32 2018 +0100 [FEED-3048] - fixed crash when output contains "out-of-range" UTF-16 chars - extended error info - fixed potential crash in wmi section 6863 FIX Fixed crash in Windows Agent on MS Exchange Servers Some Windows checks may produce invalid UTF-16 symbols or symbols which are difficult to convert into UTF-8. Now the lines containing such symbols are removed from Windows Agent output. Change-Id: I93fd856fa3176b91e27274d72df8b3419dc07e1d --- .werks/6863 | 12 ++++++++++++ agents/windows/sections/SectionPS.cc | 26 +++++++++++++++++--------- agents/windows/sections/SectionWinperf.cc | 18 +++++++++++++----- 3 files changed, 42 insertions(+), 14 deletions(-) diff --git a/.werks/6863 b/.werks/6863 new file mode 100644 index 0000000..76d04b4 --- /dev/null +++ b/.werks/6863 @@ -0,0 +1,12 @@ +Title: Fixed crash in Windows Agent on MS Exchange Servers +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1542729746 +Class: fix + +Some Windows checks may produce invalid UTF-16 symbols or symbols +which are difficult to convert into UTF-8. Now the lines containing such symbols +are removed from Windows Agent output. diff --git a/agents/windows/sections/SectionPS.cc b/agents/windows/sections/SectionPS.cc index f00af66..1d6098b 100644 --- a/agents/windows/sections/SectionPS.cc +++ b/agents/windows/sections/SectionPS.cc @@ -260,15 +260,23 @@ bool SectionPS::outputWMI(std::ostream &out) { load_uint32(L"PagefileUsage"); // according to MSDN ThreadCount // is 32 bit UNSIGNED - outputProcess( - out, std::stoull(result.get<std::string>(L"VirtualSize")), - std::stoull(result.get<std::string>(L"WorkingSetSize")), - pagefile_usage, uptime, - std::stoull(result.get<std::wstring>(L"UserModeTime")), - std::stoull(result.get<std::wstring>(L"KernelModeTime")), - process_id, handle_count, thread_count, user, - to_utf8(process_name)); - + try { + outputProcess( + out, std::stoull(result.get<std::string>(L"VirtualSize")), + std::stoull(result.get<std::string>(L"WorkingSetSize")), + pagefile_usage, uptime, + std::stoull(result.get<std::wstring>(L"UserModeTime")), + std::stoull(result.get<std::wstring>(L"KernelModeTime")), + process_id, handle_count, thread_count, user, + to_utf8(process_name)); + + } catch (const std::range_error &e) { + // catch possible exception when UTF-16 is in not valid range + // for Linux toolchain, see FEED-3048 + Error(_logger) + << "Exception: " << e.what() + << " UTF-16 -> UTF-8 conversion error. Skipping line in PS."; + } more = result.next(); } return true; diff --git a/agents/windows/sections/SectionWinperf.cc b/agents/windows/sections/SectionWinperf.cc index a3d5662..766d173 100644 --- a/agents/windows/sections/SectionWinperf.cc +++ b/agents/windows/sections/SectionWinperf.cc @@ -60,12 +60,20 @@ bool SectionWinperf::produceOutputInner(std::ostream &out, counterObject.instances(); // output instances - if any if (instances.size() > 0) { - out << instances.size() << " instances:"; - for (std::wstring name : counterObject.instanceNames()) { - std::replace(name.begin(), name.end(), L' ', L'_'); - out << " " << Utf8(name); + try { + out << instances.size() << " instances:"; + for (std::wstring name : counterObject.instanceNames()) { + std::replace(name.begin(), name.end(), L' ', L'_'); + out << " " << Utf8(name); + } + out << "\n"; + } catch (const std::range_error &e) { + // catch possible exception when UTF-16 is in not valid + // range for Linux toolchain, see FEED-3048 + Error(_logger) + << "Exception: " << e.what() + << " UTF-16 -> UTF-8 conversion error. Skipping line Win Perf."; } - out << "\n"; } // output counters