Changeset 7580 in vbox for trunk/src/VBox/Devices/Storage/VmdkHDDCore.cpp

Timestamp:

Mar 26, 2008 3:22:35 PM (17 years ago)

Author:

vboxsync

Message:

Fix error handling memory leak. And change incorrect macro naming.

File:

• trunk/src/VBox/Devices/Storage/VmdkHDDCore.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/Storage/VmdkHDDCore.cpp

@@ -39 +39 @@
 /** Maximum encoded string size (including NUL) we allow for VMDK images.
  * Deliberately not set high to avoid running out of descriptor space. */
-#define VMDK_ENCRYPTED_COMMENT_MAX 1024
+#define VMDK_ENCODED_COMMENT_MAX 1024
 
 /** VMDK descriptor DDB entry for PCHS cylinders. */
@@ -460 +460 @@
     else
     {
+        RTStrFree((char *)(void *)pVmdkFile->pszFilename);
         RTMemFree(pVmdkFile);
         *pFile = NIL_RTFILE;
@@ -545 +546 @@
 static char *vmdkEncodeString(const char *psz)
 {
-    char szEnc[VMDK_ENCRYPTED_COMMENT_MAX + 3];
+    char szEnc[VMDK_ENCODED_COMMENT_MAX + 3];
     char *pszDst = szEnc;
 
@@ -571 +572 @@
         else
             pszDst = RTStrPutCp(pszDst, Cp);
-        if (pszDst - szEnc >= VMDK_ENCRYPTED_COMMENT_MAX - 1)
+        if (pszDst - szEnc >= VMDK_ENCODED_COMMENT_MAX - 1)
         {
             pszDst = pszDstPrev;