From 1d0fad2df941f6962ec88846e31155ff16f014cd Mon Sep 17 00:00:00 2001 From: ramonn Date: Thu, 24 Nov 2011 18:18:14 +0000 Subject: [PATCH] 2011-11-24 Ramon Novoa * windows/pandora_wmi.cc: Use double instead of long for intermediate result to avoid overflows. Fixes bug #3422900. * modules/pandora_module_perfcounter.cc: Print PDH errors in a more descriptive format. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5167 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_agents/win32/ChangeLog | 8 ++++++++ .../win32/modules/pandora_module_perfcounter.cc | 4 ++-- pandora_agents/win32/windows/pandora_wmi.cc | 8 ++++---- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/pandora_agents/win32/ChangeLog b/pandora_agents/win32/ChangeLog index b9ba7b61df..f86a508d52 100644 --- a/pandora_agents/win32/ChangeLog +++ b/pandora_agents/win32/ChangeLog @@ -1,3 +1,11 @@ +2011-11-24 Ramon Novoa + + * windows/pandora_wmi.cc: Use double instead of long for intermediate + result to avoid overflows. Fixes bug #3422900. + + * modules/pandora_module_perfcounter.cc: Print PDH errors in a more + descriptive format. + 2011-11-22 Ramon Novoa * pandora_windows_service.cc: Fixed a bug that resulted in a buffer diff --git a/pandora_agents/win32/modules/pandora_module_perfcounter.cc b/pandora_agents/win32/modules/pandora_module_perfcounter.cc index 60a9f05af1..08a9b9b7ef 100755 --- a/pandora_agents/win32/modules/pandora_module_perfcounter.cc +++ b/pandora_agents/win32/modules/pandora_module_perfcounter.cc @@ -129,14 +129,14 @@ Pandora_Module_Perfcounter::run () { // Open a query object status = PdhOpenQuery (NULL, 0, &query); if (status != ERROR_SUCCESS) { - pandoraLog ("PdhOpenQuery failed with error %d", status); + pandoraLog ("PdhOpenQuery failed with error %lX", status); return; } // Add the counter that will provide the data status = PdhAddCounter (query, this->source.c_str (), 0, &counter); if (status != ERROR_SUCCESS) { - pandoraLog ("PdhAddCounter failed with error %d", status); + pandoraLog ("PdhAddCounter failed with error %lX", status); PdhCloseQuery (query); return; } diff --git a/pandora_agents/win32/windows/pandora_wmi.cc b/pandora_agents/win32/windows/pandora_wmi.cc index 9b1ffa7cd2..af0167ed27 100644 --- a/pandora_agents/win32/windows/pandora_wmi.cc +++ b/pandora_agents/win32/windows/pandora_wmi.cc @@ -321,7 +321,7 @@ long Pandora_Wmi::getFreememoryPercent () { CDhInitialize init; CDispPtr wmi_svc, quickfixes; - long free_memory, total_memory; + double free_memory, total_memory; try { dhCheck (dhGetObject (getWmiStr (L"."), NULL, &wmi_svc)); @@ -330,17 +330,17 @@ Pandora_Wmi::getFreememoryPercent () { L"SELECT FreePhysicalMemory, TotalVisibleMemorySize FROM Win32_OperatingSystem ")); FOR_EACH (quickfix, quickfixes, NULL) { - dhGetValue (L"%d", &free_memory, quickfix, + dhGetValue (L"%e", &free_memory, quickfix, L".FreePhysicalMemory"); - dhGetValue (L"%d", &total_memory, quickfix, + dhGetValue (L"%e", &total_memory, quickfix, L".TotalVisibleMemorySize"); if (total_memory == 0) { return 0; } - return free_memory * 100 / total_memory; + return (long) (free_memory * 100.0 / total_memory); } NEXT_THROW (quickfix); } catch (string errstr) { pandoraLog ("getFreememory error. %s", errstr.c_str ());