From d139dd4264afb3e7fb91bba8f605b4c3f7eea222 Mon Sep 17 00:00:00 2001
From: "mkaply%us.ibm.com"
 <mkaply%us.ibm.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 25 Aug 2003 22:34:03 +0000
Subject: [PATCH] #216848 r=mkaply, sr=blizzard (platform specific), a=mkaply
 OS/2 only - add some error checking for querying system fonts

git-svn-id: svn://10.0.0.236/trunk@146319 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/gfx/src/os2/nsDeviceContextOS2.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mozilla/gfx/src/os2/nsDeviceContextOS2.cpp b/mozilla/gfx/src/os2/nsDeviceContextOS2.cpp
index e1cceb76796..31e4456b837 100644
--- a/mozilla/gfx/src/os2/nsDeviceContextOS2.cpp
+++ b/mozilla/gfx/src/os2/nsDeviceContextOS2.cpp
@@ -460,9 +460,11 @@ nsresult GetSysFontInfo(nsSystemFontID aID, nsFont* aFont)
   char *szFacename;
 
   pointSize = atoi(szFontNameSize);
-
   szFacename = strchr(szFontNameSize, '.');
-  szFacename++;
+
+  if ((pointSize == 0) || (!szFacename) || (*(szFacename++) == '\0')) {
+     return NS_ERROR_FAILURE;
+  }
 
 #ifdef OLDCODE
   PRUnichar name[FACESIZE];