Changeset 33271 in vbox for trunk

Timestamp:

Oct 20, 2010 4:02:57 PM (14 years ago)

Author:

vboxsync

Message:

Storage/VDI: Make the code dealing with comments bullet-proof, including the case where the image doesn't have the zero termination.

File:

• trunk/src/VBox/Devices/Storage/VDIHDDCore.cpp (modified) (1 diff)

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

@@ -1668 +1668 @@
     {
         char *pszTmp = getImageComment(&pImage->Header);
-        size_t cb = strlen(pszTmp);
+        /* Make this foolproof even if the image doesn't have the zero
+         * termination. With some luck the repaired header will be saved. */
+        size_t cb = RTStrNLen(pszTmp, VDI_IMAGE_COMMENT_SIZE);
+        if (cb == VDI_IMAGE_COMMENT_SIZE)
+        {
+            pszTmp[VDI_IMAGE_COMMENT_SIZE-1] = '\0';
+            cb--;
+        }
         if (cb < cbComment)
         {