Changeset 85314 in vbox

Timestamp:

Jul 13, 2020 5:24:18 PM (5 years ago)

Author:

vboxsync

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

139292

Message:

VBox/com/string.h: Corrected Utf8Str::cloneToEx implementation to actually not throw anything. bugref:9790

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

@@ -1284 +1284 @@
      * @returns S_OK or E_OUTOFMEMORY (COM status codes).
      */
-    HRESULT cloneToEx(BSTR *pbstr) const
-    {
-        if (!pbstr)
-            return S_OK;
-        Bstr bstr(*this);
-        return bstr.detachToEx(pbstr);
-    }
+    HRESULT cloneToEx(BSTR *pbstr) const RT_NOEXCEPT;
 
     /**

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

@@ -730 +730 @@
 }
 #endif
+
+HRESULT Utf8Str::cloneToEx(BSTR *pbstr) const RT_NOEXCEPT
+{
+    if (!pbstr)
+        return S_OK;
+    Bstr bstr;
+    HRESULT hrc = bstr.assignEx(*this);
+    if (SUCCEEDED(hrc))
+        hrc = bstr.detachToEx(pbstr);
+    return hrc;
+}
 
 Utf8Str& Utf8Str::stripTrailingSlash()