From efe2ce4839dc29d94b2a31c2a60514eeeb446eee Mon Sep 17 00:00:00 2001
From: "erik%netscape.com"
 <erik%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 7 Apr 2000 17:47:40 +0000
Subject: [PATCH] was dereferencing a NULL pointer for some fonts; discovered
 via Beta 1's TalkBack; r=troy; a=leaf

git-svn-id: svn://10.0.0.236/trunk@65494 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/gfx/src/windows/nsFontMetricsWin.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/mozilla/gfx/src/windows/nsFontMetricsWin.cpp b/mozilla/gfx/src/windows/nsFontMetricsWin.cpp
index fa65f31408e..fc4c3380387 100644
--- a/mozilla/gfx/src/windows/nsFontMetricsWin.cpp
+++ b/mozilla/gfx/src/windows/nsFontMetricsWin.cpp
@@ -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)) {