Making sure that mCountRemaining also gets updated when data gets inserted into the scanner buffer. b=117441, r=heikki, sr=jst

htmlparser/src/nsScanner.cpp

@@ -294,8 +294,10 @@ PRBool nsScanner::UngetReadable(const nsAString& aBuffer) {
   mSlidingBuffer->UngetReadable(aBuffer,mCurrentPosition);
   mSlidingBuffer->BeginReading(mCurrentPosition); // Insertion invalidated our iterators
   mSlidingBuffer->EndReading(mEndPosition);
-  mTotalRead += aBuffer.Length();
  
+  PRUint32 length = aBuffer.Length();
+  mCountRemaining += length; // Ref. bug 117441
+  mTotalRead += length;
   return PR_TRUE;
 }
 

parser/htmlparser/src/nsScanner.cpp

@@ -294,8 +294,10 @@ PRBool nsScanner::UngetReadable(const nsAString& aBuffer) {
   mSlidingBuffer->UngetReadable(aBuffer,mCurrentPosition);
   mSlidingBuffer->BeginReading(mCurrentPosition); // Insertion invalidated our iterators
   mSlidingBuffer->EndReading(mEndPosition);
-  mTotalRead += aBuffer.Length();
  
+  PRUint32 length = aBuffer.Length();
+  mCountRemaining += length; // Ref. bug 117441
+  mTotalRead += length;
   return PR_TRUE;
 }