Changeset 71433 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

Mar 21, 2018 1:44:20 PM (7 years ago)

Author:

vboxsync

Message:

VBoxManage: Made the enumerate argument for getextradata optional.

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManageHelp.cpp (modified) (1 diff)
• VBoxManageMisc.cpp (modified) (3 diffs)

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

@@ -1030 +1030 @@
         RTStrmPrintf(pStrm,
                            "%s getextradata %s    global|<uuid|vmname>\n"
-                     "                            <key>|enumerate\n"
+                     "                            <key>|[enumerate]\n"
                      "\n", SEP);
 

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

@@ -813 +813 @@
     HRESULT rc = S_OK;
 
-    if (a->argc != 2)
+    if (a->argc > 2 || a->argc < 1)
         return errorSyntax(USAGE_GETEXTRADATA, "Incorrect number of parameters");
 
@@ -820 +820 @@
     {
         /* enumeration? */
-        if (!strcmp(a->argv[1], "enumerate"))
+        if (a->argc < 2 || !strcmp(a->argv[1], "enumerate"))
         {
             SafeArray<BSTR> aKeys;
@@ -856 +856 @@
         {
             /* enumeration? */
-            if (!strcmp(a->argv[1], "enumerate"))
+            if (a->argc < 2 || !strcmp(a->argv[1], "enumerate"))
             {
                 SafeArray<BSTR> aKeys;