From 74d9db565afb851cc0f36cb1903d5e1df1de4f98 Mon Sep 17 00:00:00 2001 From: "rickg%netscape.com" Date: Fri, 13 Oct 2000 01:16:56 +0000 Subject: [PATCH] fix RTM++56085 crasher; r=attinasi, sr=buster git-svn-id: svn://10.0.0.236/trunk@81095 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/htmlparser/src/CNavDTD.cpp | 2 +- mozilla/parser/htmlparser/src/CNavDTD.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mozilla/htmlparser/src/CNavDTD.cpp b/mozilla/htmlparser/src/CNavDTD.cpp index 183b7e0bf05..aed5c2d17c6 100644 --- a/mozilla/htmlparser/src/CNavDTD.cpp +++ b/mozilla/htmlparser/src/CNavDTD.cpp @@ -891,7 +891,7 @@ nsresult CNavDTD::DidHandleStartTag(nsCParserNode& aNode,eHTMLTags aChildTag){ //handle tags by generating a close tag... //added this to fix bug 48351, which contains XHTML and uses empty tags. - if(nsHTMLElement::IsContainer(aChildTag)) { + if(nsHTMLElement::IsContainer(aChildTag) && aNode.mToken) { //nullptr test fixes bug 56085 CStartToken *theToken=NS_STATIC_CAST(CStartToken*,aNode.mToken); if(theToken->IsEmpty()){ diff --git a/mozilla/parser/htmlparser/src/CNavDTD.cpp b/mozilla/parser/htmlparser/src/CNavDTD.cpp index 183b7e0bf05..aed5c2d17c6 100644 --- a/mozilla/parser/htmlparser/src/CNavDTD.cpp +++ b/mozilla/parser/htmlparser/src/CNavDTD.cpp @@ -891,7 +891,7 @@ nsresult CNavDTD::DidHandleStartTag(nsCParserNode& aNode,eHTMLTags aChildTag){ //handle tags by generating a close tag... //added this to fix bug 48351, which contains XHTML and uses empty tags. - if(nsHTMLElement::IsContainer(aChildTag)) { + if(nsHTMLElement::IsContainer(aChildTag) && aNode.mToken) { //nullptr test fixes bug 56085 CStartToken *theToken=NS_STATIC_CAST(CStartToken*,aNode.mToken); if(theToken->IsEmpty()){