Changeset 95851 in vbox

Timestamp:

Jul 26, 2022 11:38:31 PM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

152576

Message:

VBoxService/PageSharing: sprintf -> RTStrPrintf; strcat -> RTStrCat. bugref:10261

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServicePageSharing.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServicePageSharing.cpp

@@ -167 +167 @@
  * always use the wide version of the API and convert to UTF-8/whatever. */
 
-        sprintf(szFileVersionLocation, TEXT("\\StringFileInfo\\%04x%04x\\FileVersion"), lpTranslate[i].wLanguage, lpTranslate[i].wCodePage);
+        RTStrPrintf(szFileVersionLocation, sizeof(szFileVersionLocation),
+                    "\\StringFileInfo\\%04x%04x\\FileVersion", lpTranslate[i].wLanguage, lpTranslate[i].wCodePage);
         fRet = VerQueryValue(pVersionInfo, szFileVersionLocation, (LPVOID *)&pszFileVersion, &cbFileVersion);
         if (fRet)
@@ -444 +445 @@
                         break;
 
-/** @todo FullPathName not an UTF-8 string is! An ANSI string it is. */
+/** @todo FullPathName not an UTF-8 string is! An ANSI string it is
+ * according to the SYSTEM locale.  Best use RtlAnsiStringToUnicodeString to
+ * convert to UTF-16. */
                     strcpy(pModule->Info.szModule,
                            (const char *)&pSystemModules->Modules[i].FullPathName[pSystemModules->Modules[i].OffsetToFileName]);
@@ -454 +457 @@
                     {
                         /* Seen just file names in XP; try to locate the file in the system32 and system32\drivers directories. */
-                        strcat(szFullFilePath, "\\");
-                        strcat(szFullFilePath, (const char *)pSystemModules->Modules[i].FullPathName);
+                        RTStrCat(szFullFilePath, sizeof(szFullFilePath), "\\");
+                        RTStrCat(szFullFilePath, sizeof(szFullFilePath), (const char *)pSystemModules->Modules[i].FullPathName);
                         VGSvcVerbose(3, "Unexpected kernel module name try %s\n", szFullFilePath);
                         if (RTFileExists(szFullFilePath) == false)
                         {
                             GetSystemDirectoryA(szFullFilePath, sizeof(szFullFilePath));
-                            strcat(szFullFilePath, "\\drivers\\");
-                            strcat(szFullFilePath, (const char *)pSystemModules->Modules[i].FullPathName);
+                            RTStrCat(szFullFilePath, sizeof(szFullFilePath), "\\drivers\\");
+                            RTStrCat(szFullFilePath, sizeof(szFullFilePath), (const char *)pSystemModules->Modules[i].FullPathName);
                             VGSvcVerbose(3, "Unexpected kernel module name try %s\n", szFullFilePath);
                             if (RTFileExists(szFullFilePath) == false)
@@ -481 +484 @@
                         }
 
-                        strcat(szFullFilePath, lpPath);
+                        RTStrCat(szFullFilePath, sizeof(szFullFilePath), lpPath);
                     }