Changeset 20822 in vbox for trunk/src/VBox/Runtime

Timestamp:

Jun 23, 2009 12:44:05 PM (15 years ago)

Author:

vboxsync

Message:

utf8-posix.cpp: Fixed allocation bug in rtstrConvert where we would fail to allocate space the terminator if guess a too small buffer (very unlikely).

File:

• trunk/src/VBox/Runtime/r3/posix/utf8-posix.cpp (modified) (6 diffs)

trunk/src/VBox/Runtime/r3/posix/utf8-posix.cpp

@@ -45 +45 @@
 
 #ifdef RT_OS_SOLARIS
-#include <langinfo.h>
+# include <langinfo.h>
 #endif
+
+#include "internal/alignmentchecks.h"
+
 
 /*******************************************************************************
@@ -73 +76 @@
      * Allocate buffer
      */
+    bool    fUcs2Term;
     void   *pvOutput;
     size_t  cbOutput2;
@@ -81 +85 @@
         if (!pvOutput)
             return VERR_NO_TMP_MEMORY;
+        fUcs2Term = true;
     }
     else
     {
         pvOutput = *ppvOutput;
-        cbOutput2 = cbOutput - (!strcmp(pszOutputCS, "UCS-2") ? sizeof(RTUTF16) : 1);
+        fUcs2Term = !strcmp(pszOutputCS, "UCS-2");
+        cbOutput2 = cbOutput - (fUcs2Term ? sizeof(RTUTF16) : 1);
         if (cbOutput2 > cbOutput)
             return VERR_BUFFER_OVERFLOW;
@@ -105 +111 @@
             pszOutputCS = nl_langinfo(CODESET);
 #endif
+        IPRT_ALIGNMENT_CHECKS_DISABLE(); /* glibc causes trouble */
         iconv_t icHandle = iconv_open(pszOutputCS, pszInputCS);
+        IPRT_ALIGNMENT_CHECKS_ENABLE();
         if (icHandle != (iconv_t)-1)
         {
@@ -128 +136 @@
                      */
                     iconv_close(icHandle);
-                    if (!cbOutput || !strcmp(pszOutputCS, "UCS-2"))
-                        *(PRTUTF16)pvOutputLeft = '\0';
-                    else
-                        *(char *)pvOutputLeft = '\0';
+                    ((char *)pvOutputLeft)[0] = '\0';
+                    if (fUcs2Term)
+                        ((char *)pvOutputLeft)[1] = '\0';
                     *ppvOutput = pvOutput;
                     return VINF_SUCCESS;
                 }
-                else
-                    errno = E2BIG;
+                errno = E2BIG;
             }
             iconv_close(icHandle);
@@ -150 +156 @@
                     RTMemTmpFree(pvOutput);
                     cbOutput2 *= 2;
-                    pvOutput = RTMemTmpAlloc(cbOutput2);
+                    pvOutput = RTMemTmpAlloc(cbOutput2 + sizeof(RTUTF16));
                     if (!pvOutput)
                         return VERR_NO_TMP_MEMORY;