儲存庫 vbox 的更動 63156

時間撮記:

2016-8-8 下午12:11:53 (8 年 以前)

作者:

vboxsync

訊息:

GuestSession::i_objectCreateTempInternal,GuestSession::i_fsQueryInfoInternal: guestRc _was_ used uninitialized and pGuestRc not set when returning VERR_GSTCTL_GUEST_ERROR (local variable was updated instead). Changed procInfo initialization to return immediately when out of memory, as it makes the code flow unnecessarily complicated to do the single return point thing. The mExecutable was not inside the try/catch, as it need to be as it allocates memory too.

檔案:

• trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp (修改) (8 筆差異)

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

@@ -827 +827 @@
                      strTemplate.c_str(), strPath.c_str(), fDirectory));
 
-    int vrc = VINF_SUCCESS;
-
     GuestProcessStartupInfo procInfo;
-    procInfo.mFlags      = ProcessCreateFlag_WaitForStdOut;
-    procInfo.mExecutable = Utf8Str(VBOXSERVICE_TOOL_MKTEMP);
-
+    procInfo.mFlags = ProcessCreateFlag_WaitForStdOut;
     try
     {
+        procInfo.mExecutable = Utf8Str(VBOXSERVICE_TOOL_MKTEMP);
         procInfo.mArguments.push_back(procInfo.mExecutable); /* Set argv0. */
         procInfo.mArguments.push_back(Utf8Str("--machinereadable"));
@@ -849 +846 @@
     catch (std::bad_alloc)
     {
-        vrc = VERR_NO_MEMORY;
+        Log(("Out of memory!\n"));
+        return VERR_NO_MEMORY;
     }
 
     /** @todo Use an internal HGCM command for this operation, since
      *        we now can run in a user-dedicated session. */
-    int guestRc;
+    int vrcGuest = VERR_IPE_UNINITIALIZED_STATUS;
     GuestCtrlStreamObjects stdOut;
-    if (RT_SUCCESS(vrc))
-        vrc = GuestProcessTool::i_runEx(this, procInfo,
+    int vrc = GuestProcessTool::i_runEx(this, procInfo,
                                         &stdOut, 1 /* cStrmOutObjects */,
-                                        &guestRc);
-
+                                        &vrcGuest);
     if (!GuestProcess::i_isGuestError(vrc))
     {
@@ -869 +865 @@
             if (RT_FAILURE(vrc))
             {
-                guestRc = vrc;
+                if (pGuestRc)
+                    *pGuestRc = vrc;
                 vrc = VERR_GSTCTL_GUEST_ERROR;
             }
@@ -880 +877 @@
     }
     else if (pGuestRc)
-    {
-        *pGuestRc = guestRc;
-    }
+        *pGuestRc = vrcGuest;
 
     LogFlowThisFunc(("Returning rc=%Rrc, guestRc=%Rrc\n", vrc, guestRc));
@@ -1402 +1397 @@
     LogFlowThisFunc(("strPath=%s\n", strPath.c_str()));
 
-    int vrc = VINF_SUCCESS;
-
     /** @todo Merge this with IGuestFile::queryInfo(). */
     GuestProcessStartupInfo procInfo;
     procInfo.mFlags      = ProcessCreateFlag_WaitForStdOut;
-    procInfo.mExecutable = Utf8Str(VBOXSERVICE_TOOL_STAT);
-
     try
     {
+        procInfo.mExecutable = Utf8Str(VBOXSERVICE_TOOL_STAT);
         procInfo.mArguments.push_back(procInfo.mExecutable); /* Set argv0. */
         procInfo.mArguments.push_back(Utf8Str("--machinereadable"));
@@ -1420 +1412 @@
     catch (std::bad_alloc)
     {
-        vrc = VERR_NO_MEMORY;
-    }
-
-    int guestRc;
+        Log(("Out of memory!\n"));
+        return VERR_NO_MEMORY;
+    }
+
+    int vrcGuest = VERR_IPE_UNINITIALIZED_STATUS;
     GuestCtrlStreamObjects stdOut;
-    if (RT_SUCCESS(vrc))
-        vrc = GuestProcessTool::i_runEx(this, procInfo,
+    int vrc = GuestProcessTool::i_runEx(this, procInfo,
                                         &stdOut, 1 /* cStrmOutObjects */,
-                                        &guestRc);
-
+                                        &vrcGuest);
     if (!GuestProcess::i_isGuestError(vrc))
     {
@@ -1437 +1428 @@
             if (RT_FAILURE(vrc))
             {
-                guestRc = vrc;
+                if (pGuestRc)
+                    *pGuestRc = vrc;
                 vrc = VERR_GSTCTL_GUEST_ERROR;
             }
@@ -1445 +1437 @@
     }
     else if (pGuestRc)
-    {
-        *pGuestRc = guestRc;
-    }
+        *pGuestRc = vrcGuest;
 
     LogFlowThisFunc(("Returning rc=%Rrc, guestRc=%Rrc\n", vrc, guestRc));