Bug 1034916 - Remove dangerous public destructor of nsUTF8ConverterService. r=ehsan

This commit is contained in:
Andrew McCreight 2014-07-30 13:00:28 -07:00
parent fa10cc1973
commit 398f5da742
2 changed files with 5 additions and 13 deletions

View File

@ -9,22 +9,14 @@
//==============================================================
class nsUTF8ConverterService;
namespace mozilla {
template<>
struct HasDangerousPublicDestructor<nsUTF8ConverterService>
{
static const bool value = true;
};
}
class nsUTF8ConverterService: public nsIUTF8ConverterService {
public:
NS_DECL_ISUPPORTS
NS_DECL_NSIUTF8CONVERTERSERVICE
public:
nsUTF8ConverterService() {}
private:
virtual ~nsUTF8ConverterService() {}
};

View File

@ -80,9 +80,9 @@ nsCookie::Create(const nsACString &aName,
{
// Ensure mValue contains a valid UTF-8 sequence. Otherwise XPConnect will
// truncate the string after the first invalid octet.
nsUTF8ConverterService converter;
nsRefPtr<nsUTF8ConverterService> converter = new nsUTF8ConverterService();
nsAutoCString aUTF8Value;
converter.ConvertStringToUTF8(aValue, "UTF-8", false, true, 1, aUTF8Value);
converter->ConvertStringToUTF8(aValue, "UTF-8", false, true, 1, aUTF8Value);
// find the required string buffer size, adding 4 for the terminating nulls
const uint32_t stringLength = aName.Length() + aUTF8Value.Length() +