From 7431c64b152728be2532f0709be90b599a44ba55 Mon Sep 17 00:00:00 2001
From: "alecf%netscape.com"
 <alecf%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 16 Aug 2000 07:39:38 +0000
Subject: [PATCH] fix a bunch of UMRs r=syd (no bug but I needed these to get
 my purify build going)

git-svn-id: svn://10.0.0.236/trunk@76425 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/content/html/content/src/nsHTMLFontElement.cpp | 2 +-
 mozilla/content/xul/content/src/nsXULElement.cpp       | 1 +
 mozilla/gfx/src/windows/nsFontMetricsWin.cpp           | 1 +
 mozilla/htmlparser/src/nsXIFDTD.cpp                    | 1 +
 mozilla/layout/html/content/src/nsHTMLFontElement.cpp  | 2 +-
 mozilla/parser/htmlparser/src/nsXIFDTD.cpp             | 1 +
 mozilla/rdf/content/src/nsXULElement.cpp               | 1 +
 7 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/mozilla/content/html/content/src/nsHTMLFontElement.cpp b/mozilla/content/html/content/src/nsHTMLFontElement.cpp
index c4f92595a3c..412667e5f95 100644
--- a/mozilla/content/html/content/src/nsHTMLFontElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLFontElement.cpp
@@ -149,7 +149,7 @@ nsHTMLFontElement::StringToAttribute(nsIAtom* aAttribute,
     PRInt32 ec, v = tmp.ToInteger(&ec);
     if(NS_SUCCEEDED(ec)){
       tmp.CompressWhitespace(PR_TRUE, PR_FALSE);
-      PRUnichar ch = tmp.First();
+      PRUnichar ch = tmp.IsEmpty() ? 0 : tmp.First();
       aResult.SetIntValue(v, ((ch == '+') || (ch == '-')) ?
                           eHTMLUnit_Integer : eHTMLUnit_Enumerated);
       return NS_CONTENT_ATTR_HAS_VALUE;
diff --git a/mozilla/content/xul/content/src/nsXULElement.cpp b/mozilla/content/xul/content/src/nsXULElement.cpp
index 8f43eef6dc0..7b1df59d6eb 100644
--- a/mozilla/content/xul/content/src/nsXULElement.cpp
+++ b/mozilla/content/xul/content/src/nsXULElement.cpp
@@ -325,6 +325,7 @@ nsXULElement::nsXULElement()
       mDocument(nsnull),
       mParent(nsnull),
       mScriptObject(nsnull),
+      mContentId(0),
       mLazyState(0),
       mBindingParent(nsnull),
       mSlots(nsnull)
diff --git a/mozilla/gfx/src/windows/nsFontMetricsWin.cpp b/mozilla/gfx/src/windows/nsFontMetricsWin.cpp
index b3b81413669..d5999327ba1 100644
--- a/mozilla/gfx/src/windows/nsFontMetricsWin.cpp
+++ b/mozilla/gfx/src/windows/nsFontMetricsWin.cpp
@@ -2796,6 +2796,7 @@ HDC   dc1 = NULL;
 
     // Begin -- section of code to get the real x-height with GetGlyphOutline()
     GLYPHMETRICS gm;
+    memset((void*)&gm, 0, sizeof(gm));
     DWORD len = gGlyphAgent.GetGlyphMetrics(dc, PRUnichar('x'), 0, &gm);
     if (GDI_ERROR != len && gm.gmptGlyphOrigin.y > 0)
     {
diff --git a/mozilla/htmlparser/src/nsXIFDTD.cpp b/mozilla/htmlparser/src/nsXIFDTD.cpp
index 7487e0d3409..bcaf9613fc5 100644
--- a/mozilla/htmlparser/src/nsXIFDTD.cpp
+++ b/mozilla/htmlparser/src/nsXIFDTD.cpp
@@ -242,6 +242,7 @@ nsXIFDTD::nsXIFDTD() : nsIDTD(){
   mLowerCaseAttributes=PR_TRUE;
   mCharset.SetLength(0);
   mSink=0;
+  mDTDState=NS_OK;
 
   mXIFContext=new nsDTDContext();
   mNodeRecycler=0;
diff --git a/mozilla/layout/html/content/src/nsHTMLFontElement.cpp b/mozilla/layout/html/content/src/nsHTMLFontElement.cpp
index c4f92595a3c..412667e5f95 100644
--- a/mozilla/layout/html/content/src/nsHTMLFontElement.cpp
+++ b/mozilla/layout/html/content/src/nsHTMLFontElement.cpp
@@ -149,7 +149,7 @@ nsHTMLFontElement::StringToAttribute(nsIAtom* aAttribute,
     PRInt32 ec, v = tmp.ToInteger(&ec);
     if(NS_SUCCEEDED(ec)){
       tmp.CompressWhitespace(PR_TRUE, PR_FALSE);
-      PRUnichar ch = tmp.First();
+      PRUnichar ch = tmp.IsEmpty() ? 0 : tmp.First();
       aResult.SetIntValue(v, ((ch == '+') || (ch == '-')) ?
                           eHTMLUnit_Integer : eHTMLUnit_Enumerated);
       return NS_CONTENT_ATTR_HAS_VALUE;
diff --git a/mozilla/parser/htmlparser/src/nsXIFDTD.cpp b/mozilla/parser/htmlparser/src/nsXIFDTD.cpp
index 7487e0d3409..bcaf9613fc5 100644
--- a/mozilla/parser/htmlparser/src/nsXIFDTD.cpp
+++ b/mozilla/parser/htmlparser/src/nsXIFDTD.cpp
@@ -242,6 +242,7 @@ nsXIFDTD::nsXIFDTD() : nsIDTD(){
   mLowerCaseAttributes=PR_TRUE;
   mCharset.SetLength(0);
   mSink=0;
+  mDTDState=NS_OK;
 
   mXIFContext=new nsDTDContext();
   mNodeRecycler=0;
diff --git a/mozilla/rdf/content/src/nsXULElement.cpp b/mozilla/rdf/content/src/nsXULElement.cpp
index 8f43eef6dc0..7b1df59d6eb 100644
--- a/mozilla/rdf/content/src/nsXULElement.cpp
+++ b/mozilla/rdf/content/src/nsXULElement.cpp
@@ -325,6 +325,7 @@ nsXULElement::nsXULElement()
       mDocument(nsnull),
       mParent(nsnull),
       mScriptObject(nsnull),
+      mContentId(0),
       mLazyState(0),
       mBindingParent(nsnull),
       mSlots(nsnull)