Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

was dereferencing a NULL pointer for some fonts; discovered via Beta 1's

Browse Source 
TalkBack; r=troy; a=leaf


git-svn-id: svn://10.0.0.236/trunk@65494 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
erik%netscape.com 2000-04-07 17:47:40 +00:00
parent 550c4c2d2c
commit efe2ce4839
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mozilla/gfx/src/windows/nsFontMetricsWin.cpp
View File

@ -1654,6 +1654,7 @@ nsFontMetricsWin::FindGlobalFont(HDC aDC, PRUnichar c)
::SelectObject(aDC, oldFont);
::DeleteObject(font);
if (!gGlobalFonts[i].map) {
gGlobalFonts[i].skip = 1;
continue;
}
if (SameAsPreviousMap(i)) {
@ -1747,7 +1748,11 @@ nsFontMetricsWin::FindSubstituteFont(HDC aDC, PRUnichar c)
&fontType, nsnull);
::SelectObject(aDC, oldFont);
::DeleteObject(font);
if (!gGlobalFonts[i].map || fontType != NS_FONT_TYPE_UNICODE) {
if (!gGlobalFonts[i].map) {
gGlobalFonts[i].skip = 1;
continue;
}
if (fontType != NS_FONT_TYPE_UNICODE) {
continue;
}
if (SameAsPreviousMap(i)) {
@ -3786,6 +3791,7 @@ nsFontMetricsWinA::FindGlobalFont(HDC aDC, PRUnichar c)
::SelectObject(aDC, oldFont);
::DeleteObject(font);
if (!gGlobalFonts[i].map) {
gGlobalFonts[i].skip = 1;
continue;
}
if (SameAsPreviousMap(i)) {