Bug 397216 - "nsPersistentProperties shutdown leak in uconv" [p=asqueella r=smontagu a1.9=damons]

git-svn-id: svn://10.0.0.236/trunk@237319 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
reed%reedloden.com
2007-10-05 19:30:37 +00:00
parent ecbab3a770
commit 629442d003

View File

@@ -49,7 +49,7 @@
#include "nsPlatformCharset.h"
static nsGREResProperties *gInfo = nsnull;
static PRInt32 gCnt= 0;
static PRInt32 gCnt = 0;
NS_IMPL_ISUPPORTS1(nsPlatformCharset, nsIPlatformCharset)
@@ -57,6 +57,7 @@ nsPlatformCharset::nsPlatformCharset()
{
NS_TIMELINE_START_TIMER("nsPlatformCharset()");
PR_AtomicIncrement(&gCnt);
nsAutoString acpKey(NS_LITERAL_STRING("acp."));
acpKey.AppendInt(PRInt32(::GetACP() & 0x00FFFF), 10);
MapToCharset(acpKey, mCharset);
@@ -77,8 +78,6 @@ nsPlatformCharset::~nsPlatformCharset()
nsresult
nsPlatformCharset::InitInfo()
{
PR_AtomicIncrement(&gCnt); // count for gInfo
if (gInfo == nsnull) {
nsGREResProperties *info = new nsGREResProperties(NS_LITERAL_CSTRING("wincharset.properties"));