From 9f4f3e337cc215e51bc1bdf96114f086bc11dd58 Mon Sep 17 00:00:00 2001 From: "pinkerton%netscape.com" Date: Tue, 13 Mar 2001 02:13:20 +0000 Subject: [PATCH] use nsXPIDLCString to avoid the memory leak when getting a flavor out of our nsISupportsString wrappers. r=jag/sr=sfraser. bug# 71563 git-svn-id: svn://10.0.0.236/trunk@89427 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/widget/src/xpwidgets/nsTransferable.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/mozilla/widget/src/xpwidgets/nsTransferable.cpp b/mozilla/widget/src/xpwidgets/nsTransferable.cpp index 4c884f8f39f..7c4cfd8199c 100644 --- a/mozilla/widget/src/xpwidgets/nsTransferable.cpp +++ b/mozilla/widget/src/xpwidgets/nsTransferable.cpp @@ -42,6 +42,7 @@ Notes to self: #include "nsISupportsPrimitives.h" #include "nsMemory.h" #include "nsPrimitiveHelpers.h" +#include "nsXPIDLString.h" #include "nsIFileSpec.h" #include "nsIOutputStream.h" @@ -561,10 +562,10 @@ nsTransferable :: FlavorsTransferableCanImport(nsISupportsArray **_retval) convertedList->GetElementAt ( i, getter_AddRefs(genericFlavor) ); nsCOMPtr flavorWrapper ( do_QueryInterface (genericFlavor) ); - char* aDataFlavor; - flavorWrapper->GetData (&aDataFlavor); + nsXPIDLCString flavorStr; + flavorWrapper->ToString( getter_Copies(flavorStr) ); - if (!GetDataForFlavor (mDataArray, aDataFlavor)) // Don't append if already in intrinsic list + if (!GetDataForFlavor (mDataArray, flavorStr.get())) // Don't append if already in intrinsic list (*_retval)->AppendElement (genericFlavor); } // foreach flavor that can be converted to } @@ -605,10 +606,10 @@ nsTransferable :: FlavorsTransferableCanExport(nsISupportsArray **_retval) convertedList->GetElementAt ( i, getter_AddRefs(genericFlavor) ); nsCOMPtr flavorWrapper ( do_QueryInterface (genericFlavor) ); - char* aDataFlavor; - flavorWrapper->GetData (&aDataFlavor); + nsXPIDLCString flavorStr; + flavorWrapper->ToString( getter_Copies(flavorStr) ); - if (!GetDataForFlavor (mDataArray, aDataFlavor)) // Don't append if already in intrinsic list + if (!GetDataForFlavor (mDataArray, flavorStr.get())) // Don't append if already in intrinsic list (*_retval)->AppendElement (genericFlavor); } // foreach flavor that can be converted to }