Changeset 28316 in vbox for trunk/src/VBox/Main/glue

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.

Location:

trunk/src/VBox/Main/glue

Files:

• ErrorInfo.cpp (modified) (3 diffs)
• VirtualBoxErrorInfo.cpp (modified) (5 diffs)

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

@@ -88 +88 @@
     }
 
-#else // !defined (VBOX_WITH_XPCOM)
-
-    nsCOMPtr <nsIExceptionService> es;
-    es = do_GetService (NS_EXCEPTIONSERVICE_CONTRACTID, &rc);
+#else // defined (VBOX_WITH_XPCOM)
+
+    nsCOMPtr<nsIExceptionService> es;
+    es = do_GetService(NS_EXCEPTIONSERVICE_CONTRACTID, &rc);
     if (NS_SUCCEEDED(rc))
     {
-        nsCOMPtr <nsIExceptionManager> em;
-        rc = es->GetCurrentExceptionManager (getter_AddRefs (em));
+        nsCOMPtr<nsIExceptionManager> em;
+        rc = es->GetCurrentExceptionManager(getter_AddRefs (em));
         if (NS_SUCCEEDED(rc))
         {
             ComPtr<nsIException> ex;
-            rc = em->GetCurrentException (ex.asOutParam());
+            rc = em->GetCurrentException(ex.asOutParam());
             if (NS_SUCCEEDED(rc) && ex)
             {
@@ -114 +114 @@
                     bool gotSomething = false;
 
-                    rc = ex->GetResult (&mResultCode);
+                    rc = ex->GetResult(&mResultCode);
                     gotSomething |= NS_SUCCEEDED(rc);
 
-                    Utf8Str message;
-                    rc = ex->GetMessage(message.asOutParam());
-                    message.jolt();
+                    char *pszMsg;
+                    rc = ex->GetMessage(&pszMsg);
                     gotSomething |= NS_SUCCEEDED(rc);
                     if (NS_SUCCEEDED(rc))
-                        mText = message;
+                    {
+                        mText = Bstr(pszMsg);
+                        nsMemory::Free(mText);
+                    }
 
                     if (gotSomething)
@@ -140 +142 @@
     AssertComRC (rc);
 
-#endif // !defined (VBOX_WITH_XPCOM)
+#endif // defined (VBOX_WITH_XPCOM)
 }
 

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

@@ -107 +107 @@
 }
 
-#if !defined (VBOX_WITH_XPCOM)
+#if !defined(VBOX_WITH_XPCOM)
 
 /**
@@ -166 +166 @@
 }
 
-#else // !defined (VBOX_WITH_XPCOM)
+#else // !defined(VBOX_WITH_XPCOM)
 
 /**
@@ -172 +172 @@
  *  object.
  */
-HRESULT VirtualBoxErrorInfo::init (nsIException *aInfo)
+HRESULT VirtualBoxErrorInfo::init(nsIException *aInfo)
 {
     AssertReturn(aInfo, E_FAIL);
@@ -182 +182 @@
      * 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;
+    rc = aInfo->GetMessage(&pszMsg);
+    AssertComRC(rc);
+    if (NS_SUCCEEDED(rc))
+    {
+        mText = Bstr(pszMsg);
+        nsMemory::Free(pszMsg);
+    }
+    else
+        mText.setNull();
 
     return S_OK;
@@ -273 +279 @@
                                nsIException, IVirtualBoxErrorInfo)
 
-#endif /* !defined (VBOX_WITH_XPCOM) */
+#endif /* !defined(VBOX_WITH_XPCOM) */
 
 ////////////////////////////////////////////////////////////////////////////////