From 39133488523f9aaa902f8bc51588091ca7228ced Mon Sep 17 00:00:00 2001 From: Benjamin Smedberg Date: Wed, 10 Feb 2010 12:57:46 -0500 Subject: [PATCH] Followup to bug 541446 - nsIEnvironment.set will intentionally leak a string when you call it because that is required by the PR_SetEnv API. Make that string something which is not tracked by our leak detector --HG-- extra : rebase_source : 2bdaf8d6ce3a8d093c107eeb9a4b2d4643ba0136 --- xpcom/threads/nsEnvironment.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xpcom/threads/nsEnvironment.cpp b/xpcom/threads/nsEnvironment.cpp index f6e348e122e2..55bbfac68790 100644 --- a/xpcom/threads/nsEnvironment.cpp +++ b/xpcom/threads/nsEnvironment.cpp @@ -137,7 +137,7 @@ nsEnvironment::Get(const nsAString& aName, nsAString& aOutValue) * vars. */ -typedef nsBaseHashtableET EnvEntryType; +typedef nsBaseHashtableET EnvEntryType; typedef nsTHashtable EnvHashType; static EnvHashType *gEnvHash = nsnull; @@ -178,7 +178,7 @@ nsEnvironment::Set(const nsAString& aName, const nsAString& aValue) return NS_ERROR_UNEXPECTED; } - EnvEntryType* entry = gEnvHash->PutEntry(nativeName); + EnvEntryType* entry = gEnvHash->PutEntry(nativeName.get()); if (!entry) { return NS_ERROR_OUT_OF_MEMORY; }