Changeset 16369 in vbox

Timestamp:

Jan 29, 2009 2:26:18 PM (16 years ago)

Author:

vboxsync

Message:

Utf8Str::substr error handling

Location:

trunk

Files:

• include/VBox/com/string.h (modified) (1 diff)
• src/VBox/Main/glue/string.cpp (modified) (1 diff)

trunk/include/VBox/com/string.h

@@ -507 +507 @@
      * as UTF-8 codepoints instead of bytes. With the default parameters "0"
      * and "npos", this always copies the entire string.
-     * @param pos Index of first codepoints to copy from "this", counting from 0.
+     * @param pos Index of first codepoint to copy from "this", counting from 0.
      * @param n Number of codepoints to copy, starting with the one at "pos".
      */

trunk/src/VBox/Main/glue/string.cpp

@@ -44 +44 @@
     if (n)
     {
-        const char *psz = c_str();
-        RTUNICP cp;
+        const char *psz;
 
-        // walk the UTF-8 characters until where the caller wants to start
-        size_t i = pos;
-        while (i--)
-            RTStrGetCpEx(&psz, &cp);
+        if ((psz = c_str()))
+        {
+            RTUNICP cp;
 
-        const char *pFirst = psz;
+            // walk the UTF-8 characters until where the caller wants to start
+            size_t i = pos;
+            while (*psz && i--)
+                if (!(RT_SUCCESS(RTStrGetCpEx(&psz, &cp))))
+                    return ret;     // return empty string on bad encoding
 
-        if (n == npos)
-            // all the rest:
-            ret = pFirst;
-        else
-        {
-            i = n;
-            while (i--)
-                RTStrGetCpEx(&psz, &cp);
+            const char *pFirst = psz;
 
-            size_t len = psz - pFirst;
-            char *psz = (char*)RTMemAlloc(len + 1);
-            memcpy(psz, pFirst, len);
-            psz[len] = '\0';
-            ret = psz;
-            RTMemFree(psz);
+            if (n == npos)
+                // all the rest:
+                ret = pFirst;
+            else
+            {
+                i = n;
+                while (*psz && i--)
+                    if (!(RT_SUCCESS(RTStrGetCpEx(&psz, &cp))))
+                        return ret;     // return empty string on bad encoding
+
+                size_t len = psz - pFirst;
+                char *psz = (char*)RTMemAlloc(len + 1);
+                memcpy(psz, pFirst, len);
+                psz[len] = '\0';
+                ret = psz;
+                RTMemFree(psz);
+            }
         }
     }