Changeset 83556 in vbox for trunk/src/VBox/Main

Timestamp:

Apr 4, 2020 1:53:35 PM (5 years ago)

Author:

vboxsync

Message:

Guest Control/Main: Implemented first file open info validation. bugref:9320

Location:

trunk/src/VBox/Main

Files:

• include/GuestCtrlImplPrivate.h (modified) (1 diff)
• src-client/GuestSessionImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/include/GuestCtrlImplPrivate.h

@@ -635 +635 @@
         , mCreationMode(0)
         , mfOpenEx(0) { }
+
+    /**
+     * Validates a file open info.
+     *
+     * @returns \c true if valid, \c false if not.
+     */
+    bool IsValid(void) const
+    {
+        if (mfOpenEx) /** @todo Open flags not implemented yet. */
+            return false;
+
+        switch (mOpenAction)
+        {
+            case FileOpenAction_OpenExisting:
+                break;
+            case FileOpenAction_OpenOrCreate:
+                break;
+            case FileOpenAction_CreateNew:
+                break;
+            case FileOpenAction_CreateOrReplace:
+                break;
+            case FileOpenAction_OpenExistingTruncated:
+            {
+                if (   mAccessMode == FileAccessMode_ReadOnly
+                    || mAccessMode == FileAccessMode_AppendOnly
+                    || mAccessMode == FileAccessMode_AppendRead)
+                    return false;
+                break;
+            }
+            case FileOpenAction_AppendOrCreate: /* Deprecated, do not use. */
+                break;
+            default:
+                AssertFailedReturn(false);
+                break;
+        }
+
+        return true; /** @todo Do we need more checks here? */
+    }
 
     /** The filename. */

trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp

@@ -1495 +1495 @@
 
     /* Combine and validate flags. */
-    uint32_t fOpenEx = 0;
     for (size_t i = 0; i < aFlags.size(); i++)
-        fOpenEx |= aFlags[i];
-    if (fOpenEx)
-        return VERR_INVALID_PARAMETER; /* FileOpenExFlag not implemented yet. */
-    openInfo.mfOpenEx = fOpenEx;
+        openInfo.mfOpenEx |= aFlags[i];
+    /* Validation is done in i_fileOpen(). */
 
     return i_fileOpen(openInfo, pFile, prcGuest);
@@ -1520 +1517 @@
         return VERR_GSTCTL_GUEST_ERROR;
     }
+
+    if (!openInfo.IsValid())
+        return VERR_INVALID_PARAMETER;
 
     /* Create the directory object. */