Changeset 104762 in vbox for trunk/src/VBox

Timestamp:

May 22, 2024 3:09:51 PM (8 months ago)

Author:

vboxsync

Message:

GuestHost/SharedClipboard: Fixed incorrect \r -> \r\n conversion for mac in ShClConvUtf16LFToCRLF; cleaned up the code a little. bugref:10694

File:

• trunk/src/VBox/GuestHost/SharedClipboard/clipboard-common.cpp (modified) (1 diff)

trunk/src/VBox/GuestHost/SharedClipboard/clipboard-common.cpp

@@ -910 +910 @@
 }
 
-int ShClConvUtf16LFToCRLF(PCRTUTF16 pcwszSrc, size_t cwcSrc, PRTUTF16 pu16Dst, size_t cwDst)
+int ShClConvUtf16LFToCRLF(PCRTUTF16 pcwszSrc, size_t cwcSrc, PRTUTF16 pu16Dst, size_t cwcDst)
 {
     AssertPtrReturn(pcwszSrc, VERR_INVALID_POINTER);
     AssertPtrReturn(pu16Dst, VERR_INVALID_POINTER);
-    AssertReturn(cwDst, VERR_INVALID_PARAMETER);
+    AssertReturn(cwcDst, VERR_INVALID_PARAMETER);
 
     AssertMsgReturn(pcwszSrc[0] != VBOX_SHCL_UTF16BEMARKER,
                     ("Big endian UTF-16 not supported yet\n"), VERR_NOT_SUPPORTED);
 
-    int rc = VINF_SUCCESS;
-
     /* Don't copy the endian marker. */
-    size_t i = pcwszSrc[0] == VBOX_SHCL_UTF16LEMARKER ? 1 : 0;
-    size_t j = 0;
-
-    for (; i < cwcSrc; ++i, ++j)
-    {
+    size_t      offDst = 0;
+    for (size_t offSrc = pcwszSrc[0] == VBOX_SHCL_UTF16LEMARKER ? 1 : 0; offSrc < cwcSrc; ++offSrc, ++offDst)
+    {
+        /* Ensure more output space: */
+        if (offDst < cwcDst) { /* likely */ }
+        else return VERR_BUFFER_OVERFLOW;
+
         /* Don't copy the null byte, as we add it below. */
-        if (pcwszSrc[i] == 0)
+        if (pcwszSrc[offSrc] == 0)
             break;
 
-        /* Not enough space in destination? */
-        if (j == cwDst)
-        {
-            rc = VERR_BUFFER_OVERFLOW;
-            break;
-        }
-
-        if (pcwszSrc[i] == VBOX_SHCL_LINEFEED)
-        {
-            /* Insert '\r' in front of '\n', but avoid '\r\r\n' situations
-               because it will result in extra empty lines on the other side. */
-            if (i == 0 || pcwszSrc[i - 1] != VBOX_SHCL_CARRIAGERETURN)
-                pu16Dst[j++] = VBOX_SHCL_CARRIAGERETURN;
-
-            /* Not enough space in destination? */
-            if (j == cwDst)
-            {
-                rc = VERR_BUFFER_OVERFLOW;
-                break;
-            }
+        /* Check for newlines not preceeded by carriage return: "\n" -> "\r\n";  but not "\r\n" to "\r\r\n"! */
+        if (   pcwszSrc[offSrc] == VBOX_SHCL_LINEFEED
+            && (offSrc == 0 || pcwszSrc[offSrc - 1] != VBOX_SHCL_CARRIAGERETURN))
+        {
+            pu16Dst[offDst++] = VBOX_SHCL_CARRIAGERETURN;
+
+            /* Ensure sufficient output space: */
+            if (offDst < cwcDst) { /* likely */ }
+            else return VERR_BUFFER_OVERFLOW;
         }
 #ifdef RT_OS_DARWIN
-        /* Check for a single carriage return (MacOS) */
-        else if (pcwszSrc[i] == VBOX_SHCL_CARRIAGERETURN)
-        {
-            /* Set CR.r, but avoid '\r\r'. */
-            if (i == 0 || pcwszSrc[i - 1] != VBOX_SHCL_CARRIAGERETURN)
-                pu16Dst[j++] = VBOX_SHCL_CARRIAGERETURN;
-
-            /* Not enough space in destination? */
-            if (j == cwDst)
-            {
-                rc = VERR_BUFFER_OVERFLOW;
-                break;
-            }
+        /* Check for a carriage return not followed by newline (MacOS): "\r" -> "\n\r";  but not "\r\n" to "\r\n\n"! */
+        else if (   pcwszSrc[offSrc] == VBOX_SHCL_CARRIAGERETURN
+                 && (offSrc + 1 >= cwcSrc || pcwszSrc[offSrc + 1] != VBOX_SHCL_LINEFEED))
+        {
+            pu16Dst[offDst++] = VBOX_SHCL_CARRIAGERETURN;
+
+            /* Ensure more output space: */
+            if (offDst < cwcDst) { /* likely */ }
+            else return VERR_BUFFER_OVERFLOW;
 
             /* Add line feed. */
-            pu16Dst[j] = VBOX_SHCL_LINEFEED;
+            pu16Dst[offDst] = VBOX_SHCL_LINEFEED;
             continue;
         }
 #endif
-        pu16Dst[j] = pcwszSrc[i];
-    }
-
-    if (j == cwDst)
-        rc = VERR_BUFFER_OVERFLOW;
-
-    if (RT_SUCCESS(rc))
-    {
-        /* Add terminator. */
-        pu16Dst[j] = 0;
-    }
-
-    return rc;
+        pu16Dst[offDst] = pcwszSrc[offSrc];
+    }
+
+    /* Add terminator. */
+    if (offDst < cwcDst)
+    {
+        pu16Dst[offDst] = 0;
+        return VINF_SUCCESS;
+    }
+    return VERR_BUFFER_OVERFLOW;
 }