Changeset 64292 in vbox for trunk/src/VBox/Additions/common/VBoxService

Timestamp:

Oct 17, 2016 10:38:53 AM (8 years ago)

Author:

vboxsync

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

111315

Message:

VBoxTray,InstallerHelper,VBoxService: Use RTLOCALIPC_FLAGS_NATIVE_NAME and format the pipe name into buffers of the exact same size.

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo-win.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo-win.cpp

@@ -34 +34 @@
 #include <iprt/mem.h>
 #include <iprt/once.h>
+#include <iprt/process.h>
 #include <iprt/string.h>
 #include <iprt/semaphore.h>
@@ -954 +955 @@
     /* pszDomain is optional. */
 
-    int rc = VINF_SUCCESS;
-
-    char szPipeName[255];
-/** @todo r=bird:  Pointless if.  */
-    if (RTStrPrintf(szPipeName, sizeof(szPipeName), "%s%s", VBOXTRAY_IPC_PIPE_PREFIX, pszUser))
+    char szPipeName[512 + sizeof(VBOXTRAY_IPC_PIPE_PREFIX)];
+    memcpy(szPipeName, VBOXTRAY_IPC_PIPE_PREFIX, sizeof(VBOXTRAY_IPC_PIPE_PREFIX));
+    int rc = RTStrCat(szPipeName, sizeof(szPipeName), pszUser);
+    if (RT_SUCCESS(rc))
     {
         bool fReportToHost = false;
@@ -964 +964 @@
 
         RTLOCALIPCSESSION hSession;
-        rc = RTLocalIpcSessionConnect(&hSession, szPipeName, 0 /* Flags */);
+        rc = RTLocalIpcSessionConnect(&hSession, szPipeName, RTLOCALIPC_FLAGS_NATIVE_NAME);
         if (RT_SUCCESS(rc))
         {