From cb31a089270b79c4b8fdc34a33b6dcd721a13f45 Mon Sep 17 00:00:00 2001 From: Ramon Novoa Date: Tue, 25 Jun 2013 09:53:04 +0000 Subject: [PATCH] 2013-06-25 Ramon Novoa * windows/pandora_wmi.cc: When concatenating IP addresses, do not output a comma unless the IP can be parsed. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8390 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_agents/win32/ChangeLog | 5 +++++ pandora_agents/win32/windows/pandora_wmi.cc | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pandora_agents/win32/ChangeLog b/pandora_agents/win32/ChangeLog index 1bf2691408..df7a690c07 100644 --- a/pandora_agents/win32/ChangeLog +++ b/pandora_agents/win32/ChangeLog @@ -1,3 +1,8 @@ +2013-06-25 Ramon Novoa + + * windows/pandora_wmi.cc: When concatenating IP addresses, do not + output a comma unless the IP can be parsed. + 2013-06-20 Ramon Novoa * windows/winevt.h: Added to repository. Headers for Wevtapi.dll. diff --git a/pandora_agents/win32/windows/pandora_wmi.cc b/pandora_agents/win32/windows/pandora_wmi.cc index cf0f3f53dd..adfb77cc02 100644 --- a/pandora_agents/win32/windows/pandora_wmi.cc +++ b/pandora_agents/win32/windows/pandora_wmi.cc @@ -935,10 +935,10 @@ getIPs(VARIANT *ip_array){ } int num_ips = V_ARRAY(ip_array)->rgsabound[0].cElements; for (i = 0;i < num_ips;i++) { - if (i > 0) { - ret += " , "; - } if (V_VT(&pvArray[i]) == VT_BSTR) { + if (i > 0) { + ret += " , "; + } LPSTR szStringA; ret += Pandora_Strutils::strUnicodeToAnsi( V_BSTR(&pvArray[i])); }