Changeset 48717 in vbox for trunk/src/VBox/HostServices/SharedClipboard

Timestamp:

Sep 26, 2013 3:19:46 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

89346

Message:

OS X host: shared clipboard service: fix potential SEGFAULT when working with UTF16 content: updated coding style, treat more carefully with UTF8 content as well.

File:

• trunk/src/VBox/HostServices/SharedClipboard/darwin-pasteboard.cpp (modified) (2 diffs)

trunk/src/VBox/HostServices/SharedClipboard/darwin-pasteboard.cpp

@@ -175 +175 @@
                 Log(("Clipboard content is utf-16\n"));
 
-                PRTUTF16 pBytePtr = (PRTUTF16)CFDataGetBytePtr(outData);
-                if (pBytePtr)
-                    rc = RTUtf16DupEx(&pwszTmp, pBytePtr, 0);
+                PRTUTF16 pwszString = (PRTUTF16)CFDataGetBytePtr(outData);
+                if (pwszString)
+                    rc = RTUtf16DupEx(&pwszTmp, pwszString, 0);
                 else
                     rc = VERR_INVALID_PARAMETER;
@@ -186 +186 @@
                 {
                     Log(("readFromPasteboard: clipboard content is utf-8\n"));
-                    rc = RTStrToUtf16((const char*)CFDataGetBytePtr(outData), &pwszTmp);
+                    const char *pszString = (const char *)CFDataGetBytePtr(outData);
+                    if (pszString)
+                        rc = RTStrToUtf16(pszString, &pwszTmp);
+                    else
+                        rc = VERR_INVALID_PARAMETER;
                 }
             if (pwszTmp)