Changeset 32878 in vbox for trunk

Timestamp:

Oct 3, 2010 8:30:49 PM (14 years ago)

Author:

vboxsync

Message:

strncat fixes

Location:

trunk/src/VBox

Files:

• Devices/Storage/VDIHDDCore.cpp (modified) (2 diffs)
• Runtime/testcase/tstLdr-3.cpp (modified) (2 diffs)

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

@@ -290 +290 @@
     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 +361 @@
         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);
     }
 

trunk/src/VBox/Runtime/testcase/tstLdr-3.cpp

@@ -139 +139 @@
         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 +157 @@
         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);
     }