Changeset 83250 in vbox for trunk/src

Timestamp:

Mar 10, 2020 4:59:51 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

136397

Message:

Guest Control/Update Additions: Check if the .ISO file can be opened as (valid) ISO 9660 volume, and if not, bail out gracefully.

File:

• trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp (modified) (3 diffs)

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

@@ -2254 +2254 @@
         RTVFSFILE hVfsFileIso;
         rc = RTVfsFileOpenNormal(mSource.c_str(), RTFILE_O_OPEN | RTFILE_O_READ | RTFILE_O_DENY_WRITE, &hVfsFileIso);
-        if (RT_SUCCESS(rc))
+        if (RT_FAILURE(rc))
+        {
+            hr = setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                                         Utf8StrFmt(GuestSession::tr("Unable to open Guest Additions .ISO file \"%s\": %Rrc"),
+                                         mSource.c_str(), rc));
+        }
+        else
         {
             RTVFS hVfsIso;
@@ -2261 +2267 @@
             {
                 hr = setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                         Utf8StrFmt(GuestSession::tr("Unable to open Guest Additions .ISO file \"%s\": %Rrc"),
-                                         mSource.c_str(), rc));
+                                         Utf8StrFmt(GuestSession::tr("Unable to open file as ISO 9660 file system volume: %Rrc"), rc));
             }
             else
@@ -2556 +2561 @@
             if (!mProgress.isNull()) /* Progress object is optional. */
             {
+#ifdef VBOX_STRICT
+                /* If we forgot to set the progress object accordingly, let us know. */
+                HRESULT rcProgress;
+                AssertMsg(   SUCCEEDED(mProgress->COMGETTER(ResultCode(&rcProgress)))
+                          && FAILED(rcProgress), ("Task indicated an error (%Rrc), but progress did not indicate this (%Rhrc)\n",
+                                                  rc, rcProgress));
+#endif
                 com::ProgressErrorInfo errorInfo(mProgress);
                 if (   errorInfo.isFullAvailable()