Changeset 80511 in vbox for trunk/src/VBox/ImageMounter/vboximg-mount/vboximgMedia.cpp

Timestamp:

Aug 30, 2019 11:03:01 AM (5 years ago)

Author:

vboxsync

Message:

vboximg-mount: Switch to using a VFS file instead of the VDISK container directly so we can get builtin unaligned access handling without the need to duplicate the code, some memory leak fixes

File:

• trunk/src/VBox/ImageMounter/vboximg-mount/vboximgMedia.cpp (modified) (5 diffs)

trunk/src/VBox/ImageMounter/vboximg-mount/vboximgMedia.cpp

@@ -203 +203 @@
 static void displayMediumInfo(MEDIUMINFO *pInfo, int nestLevel, bool fLast)
 {
-
-    char *cbScaled = vboximgScaledSize(pInfo->cbSize);
+    char *pszSzScaled = vboximgScaledSize(pInfo->cbSize);
     int cPad = nestLevel * 2;
     if (g_vboximgOpts.fWide && !g_vboximgOpts.fVerbose)
@@ -211 +210 @@
             !fLast ? (pInfo->fSnapshot ? " | " : " +-") : (pInfo->fSnapshot ? "   " : " +-"),
             VM_MAX_NAME, pInfo->fSnapshot ? "+- <snapshot>" : pInfo->pszName,
-            cbScaled,
+            pszSzScaled,
             pInfo->pszFormat,
             pInfo->pszState,
             cPad, "", pInfo->pszUuid);
-        RTMemFree(cbScaled);
     }
     else
@@ -229 +227 @@
                 RTPrintf("    Path:    %s\n", pInfo->pszPath);
                 RTPrintf("    Format:  %s\n", pInfo->pszFormat);
-                RTPrintf("    Size:    %s\n", cbScaled);
+                RTPrintf("    Size:    %s\n", pszSzScaled);
                 RTPrintf("    State:   %s\n", pInfo->pszState);
                 RTPrintf("    Type:    %s\n", pInfo->pszType);
@@ -243 +241 @@
                 RTPrintf("         Desc:     %s\n", pInfo->pszDescription);
             }
-            RTPrintf("         Size:     %s\n", cbScaled);
+            RTPrintf("         Size:     %s\n", pszSzScaled);
             if (g_vboximgOpts.fVerbose)
                 RTPrintf("         Path:     %s\n", pInfo->pszPath);
@@ -249 +247 @@
         }
     }
+    RTMemFree(pszSzScaled);
 }