Changeset 60145 in vbox for trunk/src/VBox/Main

Timestamp:

Mar 23, 2016 8:51:33 AM (9 years ago)

Author:

vboxsync

Message:

USBGetDevices.cpp: Remove control chars from strings, replace tab with space. bugref:8284

File:

• trunk/src/VBox/Main/src-server/linux/USBGetDevices.cpp (modified) (5 diffs)

trunk/src/VBox/Main/src-server/linux/USBGetDevices.cpp

@@ -139 +139 @@
 
     return VINF_SUCCESS;
+}
+
+
+/**
+ * Purge string of non-UTF-8 encodings and control characters.
+ *
+ * @returns String length (excluding terminator).
+ * @param   psz                 The string to purge.
+ */
+static size_t usbPurgeEncoding(char *psz)
+{
+    /* Beat it into valid UTF-8 encoding. */
+    RTStrPurgeEncoding(psz);
+
+    /* Look for control characters. */
+    size_t offSrc;
+    for (offSrc = 0; ; offSrc++)
+    {
+        char ch = psz[offSrc];
+        if (RT_UNLIKELY(RT_C_IS_CNTRL(ch)))
+        {
+            /* Found a control character! Replace tab by space and remove all others. */
+            size_t offDst = offSrc;
+            for (;; offSrc++)
+            {
+                ch = psz[offSrc];
+                if (RT_C_IS_CNTRL(ch))
+                {
+                    if (ch == '\t')
+                        ch = ' ';
+                    else
+                        continue;
+                }
+                psz[offDst++] = ch;
+                if (ch == '\0')
+                    break;
+            }
+            return offDst - 1;
+        }
+        if (ch == '\0')
+            break;
+    }
+    return offSrc - 1;
 }
 
@@ -328 +371 @@
     if (psz)
     {
-        RTStrPurgeEncoding(psz);
+        usbPurgeEncoding(psz);
         *ppsz = psz;
         return VINF_SUCCESS;
@@ -1305 +1348 @@
     if (cchRead > 0 && (size_t) cchRead < sizeof(szBuf))
     {
-        RTStrPurgeEncoding(szBuf);
+        usbPurgeEncoding(szBuf);
         Dev->pszProduct = RTStrDup(szBuf);
     }
@@ -1313 +1356 @@
     if (cchRead > 0 && (size_t) cchRead < sizeof(szBuf))
     {
-        RTStrPurgeEncoding(szBuf);
+        usbPurgeEncoding(szBuf);
         Dev->pszSerialNumber = RTStrDup(szBuf);
         Dev->u64SerialHash = USBLibHashSerial(szBuf);
@@ -1322 +1365 @@
     if (cchRead > 0 && (size_t) cchRead < sizeof(szBuf))
     {
-        RTStrPurgeEncoding(szBuf);
+        usbPurgeEncoding(szBuf);
         Dev->pszManufacturer = RTStrDup(szBuf);
     }