Changeset 3160 in vbox

Timestamp:

Jun 19, 2007 5:26:15 PM (17 years ago)

Author:

vboxsync

Message:

rtUtf16RecodeAsUtf8 takes a cch excluding the terminator. removed dead code.

File:

• trunk/src/VBox/Runtime/utf-16.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/utf-16.cpp

@@ -477 +477 @@
             if (cch <= cchResult)
                 return VERR_BUFFER_OVERFLOW;
-            // cchResult = cch;
             pszResult = *ppsz;
         }
@@ -484 +483 @@
             *ppsz = NULL;
             fShouldFree = true;
-            // cchResult = RT_MAX(cch, cchResult + 1);
             cch = RT_MAX(cch, cchResult + 1);
             pszResult = (char *)RTMemAlloc(cch);
@@ -490 +488 @@
         if (pszResult)
         {
-            rc = rtUtf16RecodeAsUtf8(pwszString, cwcString, pszResult, cch, &cchResult);
+            rc = rtUtf16RecodeAsUtf8(pwszString, cwcString, pszResult, cch - 1, &cch);
             if (RT_SUCCESS(rc))
             {