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);