Changeset 56590 in vbox

Timestamp:

Jun 23, 2015 7:03:29 AM (9 years ago)

Author:

vboxsync

Message:

Frontend/VBoxManage: avoid crash with empty string (happened during debugging the server side), plus mostly whitespace cleanups

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageMetrics.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageMetrics.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -81 +81 @@
             rc = aVirtualBox->FindMachine(Bstr(argv[0]).raw(),
                                           machine.asOutParam());
-            if (SUCCEEDED (rc))
+            if (SUCCEEDED(rc))
             {
                 retObjects.reset(1);
@@ -108 +108 @@
      * sub-metric name: CPU/MHz and Net/<iface>/LinkSpeed.
      */
-    if (strcmp(pszRaw, "CPU/MHz") && !RTStrSimplePatternMatch("Net/*/LinkSpeed", pszRaw))
+    if (pszRaw && strcmp(pszRaw, "CPU/MHz") && !RTStrSimplePatternMatch("Net/*/LinkSpeed", pszRaw))
     {
         char *pszSlash = strrchr(pszRaw, '/');
@@ -303 +303 @@
     com::SafeArray<ULONG>         retLengths;
     com::SafeArray<LONG>          retData;
-    CHECK_ERROR (performanceCollector, QueryMetricsData(ComSafeArrayAsInParam(metrics),
-                                             ComSafeArrayAsInParam(objects),
-                                             ComSafeArrayAsOutParam(retNames),
-                                             ComSafeArrayAsOutParam(retObjects),
-                                             ComSafeArrayAsOutParam(retUnits),
-                                             ComSafeArrayAsOutParam(retScales),
-                                             ComSafeArrayAsOutParam(retSequenceNumbers),
-                                             ComSafeArrayAsOutParam(retIndices),
-                                             ComSafeArrayAsOutParam(retLengths),
-                                             ComSafeArrayAsOutParam(retData)) );
+    CHECK_ERROR(performanceCollector, QueryMetricsData(ComSafeArrayAsInParam(metrics),
+                                                       ComSafeArrayAsInParam(objects),
+                                                       ComSafeArrayAsOutParam(retNames),
+                                                       ComSafeArrayAsOutParam(retObjects),
+                                                       ComSafeArrayAsOutParam(retUnits),
+                                                       ComSafeArrayAsOutParam(retScales),
+                                                       ComSafeArrayAsOutParam(retSequenceNumbers),
+                                                       ComSafeArrayAsOutParam(retIndices),
+                                                       ComSafeArrayAsOutParam(retLengths),
+                                                       ComSafeArrayAsOutParam(retData)) );
 
     RTPrintf("Object     Metric               Values\n"
@@ -501 +501 @@
         com::SafeArray<ULONG>         retLengths;
         com::SafeArray<LONG>          retData;
-        CHECK_ERROR (performanceCollector, QueryMetricsData(ComSafeArrayAsInParam(metrics),
-                                                 ComSafeArrayAsInParam(objects),
-                                                 ComSafeArrayAsOutParam(retNames),
-                                                 ComSafeArrayAsOutParam(retObjects),
-                                                 ComSafeArrayAsOutParam(retUnits),
-                                                 ComSafeArrayAsOutParam(retScales),
-                                                 ComSafeArrayAsOutParam(retSequenceNumbers),
-                                                 ComSafeArrayAsOutParam(retIndices),
-                                                 ComSafeArrayAsOutParam(retLengths),
-                                                 ComSafeArrayAsOutParam(retData)) );
+        CHECK_ERROR(performanceCollector, QueryMetricsData(ComSafeArrayAsInParam(metrics),
+                                                           ComSafeArrayAsInParam(objects),
+                                                           ComSafeArrayAsOutParam(retNames),
+                                                           ComSafeArrayAsOutParam(retObjects),
+                                                           ComSafeArrayAsOutParam(retUnits),
+                                                           ComSafeArrayAsOutParam(retScales),
+                                                           ComSafeArrayAsOutParam(retSequenceNumbers),
+                                                           ComSafeArrayAsOutParam(retIndices),
+                                                           ComSafeArrayAsOutParam(retLengths),
+                                                           ComSafeArrayAsOutParam(retData)) );
         for (unsigned j = 0; j < retNames.size(); j++)
         {