Changeset 15994 in vbox

Timestamp:

Jan 16, 2009 2:16:33 PM (16 years ago)

Author:

vboxsync

Message:

Fe/VBoxManage, Main: Enumerating guest properties did not work correctly (invalid parameter).

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageGuestProp.cpp (modified) (1 diff)
• Main/MachineImpl.cpp (modified) (1 diff)

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

@@ -353 +353 @@
  * Pack the patterns
  */
-    Utf8Str Utf8Patterns(argc > 2 ? argv[2] : "");
+    Utf8Str Utf8Patterns(argc > 2 ? argv[2] : "*");
     for (ssize_t i = 3; i < argc; ++i)
         Utf8Patterns = Utf8StrFmt ("%s,%s", Utf8Patterns.raw(), argv[i]);

trunk/src/VBox/Main/MachineImpl.cpp

@@ -3170 +3170 @@
     if (!VALID_PTR (aPatterns) && (aPatterns != NULL))
         return E_POINTER;
-    CheckComArgSafeArrayNotNull (aNames);
-    CheckComArgSafeArrayNotNull (aValues);
-    CheckComArgSafeArrayNotNull (aTimestamps);
-    CheckComArgSafeArrayNotNull (aFlags);
+
+    if (ComSafeArrayOutIsNull (aNames))
+        return E_POINTER;
+    if (ComSafeArrayOutIsNull (aValues))
+        return E_POINTER;
+    if (ComSafeArrayOutIsNull (aTimestamps))
+        return E_POINTER;
+    if (ComSafeArrayOutIsNull (aFlags))
+        return E_POINTER;
 
     AutoCaller autoCaller (this);