Index: /trunk/src/VBox/Devices/Storage/VDIHDDCore.cpp
===================================================================
--- /trunk/src/VBox/Devices/Storage/VDIHDDCore.cpp	(revision 32877)
+++ /trunk/src/VBox/Devices/Storage/VDIHDDCore.cpp	(revision 32878)
@@ -290,5 +290,5 @@
     pPreHdr->u32Version = VDI_IMAGE_VERSION;
     memset(pPreHdr->szFileInfo, 0, sizeof(pPreHdr->szFileInfo));
-    strncat(pPreHdr->szFileInfo, VDI_IMAGE_FILE_INFO, sizeof(pPreHdr->szFileInfo));
+    strncat(pPreHdr->szFileInfo, VDI_IMAGE_FILE_INFO, sizeof(pPreHdr->szFileInfo)-1);
 }
 
@@ -361,5 +361,5 @@
         AssertMsg(strlen(pszComment) < sizeof(pHeader->u.v1.szComment),
                   ("HDD Comment is too long, cb=%d\n", strlen(pszComment)));
-        strncat(pHeader->u.v1.szComment, pszComment, sizeof(pHeader->u.v1.szComment));
+        strncat(pHeader->u.v1.szComment, pszComment, sizeof(pHeader->u.v1.szComment)-1);
     }
 
Index: /trunk/src/VBox/Runtime/testcase/tstLdr-3.cpp
===================================================================
--- /trunk/src/VBox/Runtime/testcase/tstLdr-3.cpp	(revision 32877)
+++ /trunk/src/VBox/Runtime/testcase/tstLdr-3.cpp	(revision 32878)
@@ -139,5 +139,5 @@
         pSym->aSyms[0].szName[0] = '\0';
         if (pszSymbol)
-            strncat(pSym->aSyms[0].szName, pszSymbol, sizeof(pSym->aSyms[0].szName));
+            strncat(pSym->aSyms[0].szName, pszSymbol, sizeof(pSym->aSyms[0].szName)-1);
     }
 
@@ -157,5 +157,5 @@
         pSym->aSyms[1].szName[0] = '\0';
         if (pszSymbol)
-            strncat(pSym->aSyms[1].szName, pszSymbol, sizeof(pSym->aSyms[1].szName));
+            strncat(pSym->aSyms[1].szName, pszSymbol, sizeof(pSym->aSyms[1].szName)-1);
     }