Changeset 100509 in vbox for trunk/src/VBox

Timestamp:

Jul 11, 2023 11:23:47 AM (20 months ago)

Author:

vboxsync

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

158294

Message:

Shared Clipboard: Resolved a @todo: Use CoTaskMemAlloc() in SharedClipboardWinStreamImpl::Stat(). bugref:9437

File:

• trunk/src/VBox/GuestHost/SharedClipboard/ClipboardStreamImpl-win.cpp (modified) (1 diff)

trunk/src/VBox/GuestHost/SharedClipboard/ClipboardStreamImpl-win.cpp

@@ -291 +291 @@
             case STATFLAG_DEFAULT:
             {
-                /** @todo r=bird: This is using the wrong allocator.  According to MSDN the
-                 * caller will pass this to CoTaskMemFree, so we should use CoTaskMemAlloc to
-                 * allocate it. */
-                int rc2 = RTStrToUtf16(m_strPath.c_str(), &pStatStg->pwcsName);
-                if (RT_FAILURE(rc2))
-                    hr = E_FAIL;
+                size_t const cchLen = m_strPath.length() + 1 /* Include terminator */;
+                pStatStg->pwcsName = (LPOLESTR)CoTaskMemAlloc(cchLen * sizeof(RTUTF16));
+                if (pStatStg->pwcsName)
+                {
+                    PRTUTF16 pwszStr;
+                    int rc2 = RTStrToUtf16(m_strPath.c_str(), &pwszStr);
+                    if (RT_SUCCESS(rc2))
+                    {
+                        memcpy(pStatStg->pwcsName, pwszStr, cchLen * sizeof(RTUTF16));
+                        RTUtf16Free(pwszStr);
+                        pwszStr = NULL;
+                    }
+
+                    if (RT_FAILURE(rc2))
+                    {
+                        CoTaskMemFree(pStatStg->pwcsName);
+                        pStatStg->pwcsName = NULL;
+                        hr = E_UNEXPECTED;
+                    }
+                }
+                else
+                    hr = E_OUTOFMEMORY;
                 break;
             }