Changeset 28915 in vbox for trunk/src/VBox/Runtime/r3/os2

Timestamp:

Apr 29, 2010 6:12:35 PM (15 years ago)

Author:

vboxsync

Message:

iprt: More path conversion avoidance.

File:

• trunk/src/VBox/Runtime/r3/os2/rtProcInitExePath-os2.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/r3/os2/rtProcInitExePath-os2.cpp

@@ -48 +48 @@
     _execname(pszPath, cchPath);
 
-    char *pszTmp;
-    int rc = rtPathFromNative(&pszTmp, pszPath);
+    char const *pszTmp;
+    int rc = rtPathFromNative(&pszTmp, pszPath, NULL);
     AssertMsgRCReturn(rc, ("rc=%Rrc pszLink=\"%s\"\nhex: %.*Rhsx\n", rc, pszPath, cchPath, pszPath), rc);
-
-    size_t cch = strlen(pszTmp);
-    AssertReturn(cch <= cchPath, VERR_BUFFER_OVERFLOW);
-
-    memcpy(pszPath, pszTmp, cch + 1);
-    RTStrFree(pszTmp);
-
-    return VINF_SUCCESS;
+    if (pszTmp != pszPath)
+    {
+        rc = RTStrCopy(pszPath, cchPath, pszTmp);
+        rtPathFreeIprt(pszTmp, pszPath);
+    }
+    return rc;
 }