Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 14:22:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix 84401 fix memory leak in font pref enumeration code

Browse Source 
change char* to nsXPIDLString
r=dbaron sr=kin a=dbaron
This commit is contained in:
ftang%netscape.com 2001-06-18 21:13:27 +00:00
parent 632ee66143
commit 754d037891
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gfx/src/gtk/nsFontMetricsGTK.cpp
View File

@ -36,6 +36,7 @@
#include "nsHashtable.h"
#include "nsReadableUtils.h"
#include "nsAWritableString.h"
#include "nsXPIDLString.h"
#include <gdk/gdk.h>
#include <gdk/gdkx.h>
@ -3342,13 +3343,11 @@ PrefEnumCallback(const char* aName, void* aClosure)
NS_ASSERTION(s->mFont->SupportsChar(s->mChar), "font supposed to support this char");
return;
}
char* value = nsnull;
gPref->CopyCharPref(aName, &value);
nsXPIDLCString value;
gPref->CopyCharPref(aName, getter_Copies(value));
nsCAutoString name;
if (value) {
name = value;
nsMemory::Free(value);
value = nsnull;
FIND_FONT_PRINTF((" PrefEnumCallback"));
s->mFont = s->mMetrics->TryNode(&name, s->mChar);
if (s->mFont) {
@ -3361,11 +3360,9 @@ PrefEnumCallback(const char* aName, void* aClosure)
NS_ASSERTION(s->mFont->SupportsChar(s->mChar), "font supposed to support this char");
return;
}
gPref->CopyDefaultCharPref(aName, &value);
gPref->CopyDefaultCharPref(aName, getter_Copies(value));
if ((value) && (!name.Equals(value))) {
name = value;
nsMemory::Free(value);
value = nsnull;
FIND_FONT_PRINTF((" PrefEnumCallback:default"));
s->mFont = s->mMetrics->TryNode(&name, s->mChar);
if (s->mFont) {