Changeset 23911 in vbox

Timestamp:

Oct 20, 2009 3:56:43 PM (15 years ago)

Author:

vboxsync

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

53713

Message:

Main: fix for fix for tiny memory leak in GetExtraData

Location:

trunk/src/VBox/Main

Files:

• MachineImpl.cpp (modified) (2 diffs)
• VirtualBoxImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -2743 +2743 @@
 
     /* start with nothing found */
-    Utf8Str strResult;
+    Bstr bstrResult("");
 
     AutoReadLock alock (this);
@@ -2750 +2750 @@
     if (it != mData->m_pMachineConfigFile->mapExtraDataItems.end())
         // found:
-        strResult = it->second;
+        bstrResult = it->second; // source is a Utf8Str
 
     /* return the result to caller (may be empty) */
-    strResult.cloneTo(aValue);
+    bstrResult.cloneTo(aValue);
 
     return S_OK;

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -1607 +1607 @@
 
     /* start with nothing found */
-    Utf8Str strResult;
+    Bstr bstrResult("");
 
     settings::ExtraDataItemsMap::const_iterator it = m->pMainConfigFile->mapExtraDataItems.find(Utf8Str(aKey));
     if (it != m->pMainConfigFile->mapExtraDataItems.end())
         // found:
-        strResult = it->second;
+        bstrResult = it->second; // source is a Utf8Str
 
     /* return the result to caller (may be empty) */
-    strResult.cloneTo(aValue);
+    bstrResult.cloneTo(aValue);
 
     return S_OK;