Changeset 34437 in vbox for trunk/src

Timestamp:

Nov 28, 2010 9:46:04 PM (14 years ago)

Author:

vboxsync

Message:

VBoxExtPackHelperApp.cpp: missing release calls and call RTManifestPtIosAddEntryNow explicitly to catch errors.

File:

• trunk/src/VBox/Main/VBoxExtPackHelperApp.cpp (modified) (2 diffs)

trunk/src/VBox/Main/VBoxExtPackHelperApp.cpp

@@ -518 +518 @@
             if (RT_SUCCESS(rc))
             {
-                /*
-                 * Set the mode mask.
-                 */
-                ObjInfo.Attr.fMode &= ~(RTFS_UNIX_IWOTH | RTFS_UNIX_IWGRP);
-                rc = RTFileSetMode(hFile, ObjInfo.Attr.fMode);
-                /** @todo Windows needs to do more here, I think. */
+                rc = RTManifestPtIosAddEntryNow(hVfsIosDst);
                 if (RT_SUCCESS(rc))
                 {
-                    return RTEXITCODE_SUCCESS;
+                    RTVfsIoStrmRelease(hVfsIosDst);
+                    hVfsIosDst = NIL_RTVFSIOSTREAM;
+
+                    /*
+                     * Set the mode mask.
+                     */
+                    ObjInfo.Attr.fMode &= ~(RTFS_UNIX_IWOTH | RTFS_UNIX_IWGRP);
+                    rc = RTFileSetMode(hFile, ObjInfo.Attr.fMode);
+                    /** @todo Windows needs to do more here, I think. */
+                    if (RT_SUCCESS(rc))
+                    {
+                        RTFileClose(hFile);
+                        return RTEXITCODE_SUCCESS;
+                    }
+
+                    RTMsgError("Failed to set the mode of '%s' to %RTfmode: %Rrc", pszDstFilename, ObjInfo.Attr.fMode, rc);
                 }
-                RTMsgError("Failed to set the mode of '%s' to %RTfmode: %Rrc", pszDstFilename, ObjInfo.Attr.fMode, rc);
+                else
+                    RTMsgError("RTManifestPtIosAddEntryNow failed for '%s': %Rrc", pszDstFilename, rc);
             }
             else
                 RTMsgError("RTVfsUtilPumpIoStreams failed for '%s': %Rrc", pszDstFilename, rc);
+            RTVfsIoStrmRelease(hVfsIosDst);
         }
         else
@@ -538 +550 @@
     else
         RTMsgError("RTVfsIoStrmFromRTFile failed: %Rrc", rc);
+    RTFileClose(hFile);
     return RTEXITCODE_FAILURE;
 }