Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-04 13:07:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Andrew McCreight 2014-07-31 10:06:00 -07:00
parent 23cdfd9cc2
commit e6ff458e86
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
intl/uconv/nsUTF8ConverterService.h
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() {}
};

5
netwerk/cookie/nsCookie.cpp
View File

@ -6,6 +6,7 @@
#include "nsCookie.h"
#include "nsUTF8ConverterService.h"
#include <stdlib.h>
#include "nsAutoPtr.h"
/******************************************************************************
* nsCookie:
@ -80,9 +81,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() +