From 7a159c2fb21b9eb8b2a45a2c97efda4e88c970ca Mon Sep 17 00:00:00 2001
From: "arougthopher%lizardland.net" <arougthopher%lizardland.net>
Date: Tue, 8 Oct 2002 04:16:04 +0000
Subject: [PATCH] Bugzilla Bug 173116 CRASH: BeZilla sometimes crashes on
 count_font_styles

r=arougthopher
sr=arougthopher
---
 gfx/src/beos/nsFontMetricsBeOS.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gfx/src/beos/nsFontMetricsBeOS.cpp b/gfx/src/beos/nsFontMetricsBeOS.cpp
index 35a390be7a0..e99035d4ceb 100644
--- a/gfx/src/beos/nsFontMetricsBeOS.cpp
+++ b/gfx/src/beos/nsFontMetricsBeOS.cpp
@@ -185,17 +185,17 @@ NS_IMETHODIMP nsFontMetricsBeOS::Init(const nsFont& aFont, nsIAtom* aLangGroup,
       nsMemory::Free(family);
 
       // look up prefs
-      char *real_family = NULL;
+      nsXPIDLCString real_family;
       nsresult res = NS_ERROR_FAILURE;
       //NS_WITH_SERVICE( nsIPref, prefs, kPrefCID, &res );
       nsCOMPtr<nsIPref> prefs = do_GetService( kPrefCID, &res );
       if (res == NS_OK) 
       {
-        prefs->CopyCharPref( prop, &real_family );
+        prefs->CopyCharPref( prop, getter_Copies(real_family));
 
-        if ((real_family) && count_font_styles((font_family)real_family) > 0) 
+        if (real_family.get() && strlen(real_family.get()) <= B_FONT_FAMILY_LENGTH + 1  && count_font_styles((font_family)real_family.get()) > 0) 
         {
-          mFontHandle.SetFamilyAndStyle( (font_family)real_family, NULL );
+          mFontHandle.SetFamilyAndStyle( (font_family)real_family.get(), NULL );
           fontfound = PR_TRUE;
           break;        
         }