Changeset 28316 in vbox for trunk/src/VBox/Main/VirtualBoxErrorInfoImpl.cpp

Timestamp:

Apr 14, 2010 6:01:39 PM (15 years ago)

Author:

vboxsync

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

60075

Message:

com/string.h,Main: Removed Utf8Str::asOutParam() as it mixed allocators - COM/XPCOM allocates the returned param, while RTMemFree is used to free it -> bang.

File:

• trunk/src/VBox/Main/VirtualBoxErrorInfoImpl.cpp (modified) (5 diffs)

trunk/src/VBox/Main/VirtualBoxErrorInfoImpl.cpp

@@ -82 +82 @@
 }
 
-#if !defined (VBOX_WITH_XPCOM)
+#if !defined(VBOX_WITH_XPCOM)
 
 /**
@@ -141 +141 @@
 }
 
-#else // !defined (VBOX_WITH_XPCOM)
+#else // defined(VBOX_WITH_XPCOM)
 
 /**
@@ -147 +147 @@
  *  object.
  */
-HRESULT VirtualBoxErrorInfo::init (nsIException *aInfo)
+HRESULT VirtualBoxErrorInfo::init(nsIException *aInfo)
 {
     AssertReturn(aInfo, E_FAIL);
@@ -157 +157 @@
      * corresponding fields will simply remain null in this case). */
 
-    rc = aInfo->GetResult (&mResultCode);
-    AssertComRC (rc);
-    Utf8Str message;
-    rc = aInfo->GetMessage(message.asOutParam());
-    message.jolt();
-    AssertComRC (rc);
-    mText = message;
+    rc = aInfo->GetResult(&mResultCode);
+    AssertComRC(rc);
+
+    char *pszMsg;             /* No Utf8Str.asOutParam, different allocator! */
+    rc = aInfo->GetMessage(&pszMsg);
+    AssertComRC(rc);
+    if (NS_SUCCEEDED(rc))
+    {
+        mText = Bstr(pszMsg);
+        nsMemory::Free(pszMsg);
+    }
+    else
+        mText.setNull();
 
     return S_OK;
@@ -247 +253 @@
                                nsIException, IVirtualBoxErrorInfo)
 
-#endif // !defined (VBOX_WITH_XPCOM)
+#endif // defined(VBOX_WITH_XPCOM)
 /* vi: set tabstop=4 shiftwidth=4 expandtab: */