From 4b939ebc0d4113fc8cddfd25972a42927e6cbd9f Mon Sep 17 00:00:00 2001
From: "harishd%netscape.com"
 <harishd%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 12 Jan 2001 21:16:40 +0000
Subject: [PATCH] 60498 - Strip off embedded null char found between
 tokens/tags. r=heikki sr=vidur

git-svn-id: svn://10.0.0.236/trunk@84889 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/htmlparser/src/nsHTMLTokenizer.cpp        | 7 ++++++-
 mozilla/parser/htmlparser/src/nsHTMLTokenizer.cpp | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/mozilla/htmlparser/src/nsHTMLTokenizer.cpp b/mozilla/htmlparser/src/nsHTMLTokenizer.cpp
index 56210fcf8ba..b32cfbde208 100644
--- a/mozilla/htmlparser/src/nsHTMLTokenizer.cpp
+++ b/mozilla/htmlparser/src/nsHTMLTokenizer.cpp
@@ -462,7 +462,12 @@ nsresult nsHTMLTokenizer::ConsumeToken(nsScanner& aScanner,PRBool& aFlushTokens)
       }
       else {
         if(!nsCRT::IsAsciiSpace(theChar)) {
-          result=ConsumeText(theToken,aScanner);
+          if(theChar!=nsnull) { 
+            result=ConsumeText(theToken,aScanner); 
+          } 
+          else { 
+            aScanner.GetChar(theChar); // skip the embedded null char. Fix bug 64098. 
+          } 
           break;
         }
         result=ConsumeWhitespace(theChar,theToken,aScanner);
diff --git a/mozilla/parser/htmlparser/src/nsHTMLTokenizer.cpp b/mozilla/parser/htmlparser/src/nsHTMLTokenizer.cpp
index 56210fcf8ba..b32cfbde208 100644
--- a/mozilla/parser/htmlparser/src/nsHTMLTokenizer.cpp
+++ b/mozilla/parser/htmlparser/src/nsHTMLTokenizer.cpp
@@ -462,7 +462,12 @@ nsresult nsHTMLTokenizer::ConsumeToken(nsScanner& aScanner,PRBool& aFlushTokens)
       }
       else {
         if(!nsCRT::IsAsciiSpace(theChar)) {
-          result=ConsumeText(theToken,aScanner);
+          if(theChar!=nsnull) { 
+            result=ConsumeText(theToken,aScanner); 
+          } 
+          else { 
+            aScanner.GetChar(theChar); // skip the embedded null char. Fix bug 64098. 
+          } 
           break;
         }
         result=ConsumeWhitespace(theChar,theToken,aScanner);