diff --git a/src/internal/XMLReader.cpp b/src/internal/XMLReader.cpp
index d660af1ae8b694d53ea40c56e9dce63f5d315597..3d84fdb71a335a89ac9eb3e2960403e3cbaa65a0 100644
--- a/src/internal/XMLReader.cpp
+++ b/src/internal/XMLReader.cpp
@@ -1,37 +1,37 @@
 /*
  * The Apache Software License, Version 1.1
- * 
+ *
  * Copyright (c) 1999-2000 The Apache Software Foundation.  All rights
  * reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
- * 
+ *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- * 
+ *    notice, this list of conditions and the following disclaimer.
+ *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
  *    the documentation and/or other materials provided with the
  *    distribution.
- * 
+ *
  * 3. The end-user documentation included with the redistribution,
- *    if any, must include the following acknowledgment:  
+ *    if any, must include the following acknowledgment:
  *       "This product includes software developed by the
  *        Apache Software Foundation (http://www.apache.org/)."
  *    Alternately, this acknowledgment may appear in the software itself,
  *    if and wherever such third-party acknowledgments normally appear.
- * 
+ *
  * 4. The names "Xerces" and "Apache Software Foundation" must
  *    not be used to endorse or promote products derived from this
- *    software without prior written permission. For written 
+ *    software without prior written permission. For written
  *    permission, please contact apache\@apache.org.
- * 
+ *
  * 5. Products derived from this software may not be called "Apache",
  *    nor may "Apache" appear in their name, without prior written
  *    permission of the Apache Software Foundation.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * ====================================================================
- * 
+ *
  * This software consists of voluntary contributions made by many
  * individuals on behalf of the Apache Software Foundation, and was
  * originally based on software copyright (c) 1999, International
@@ -56,6 +56,9 @@
 
 /*
  * $Log$
+ * Revision 1.13  2000/05/11 00:41:48  rahulj
+ * Defect reported by SHOGO SAWAKI <shogo_sawaki@mx.nasw.mhi.co.jp>
+ *
  * Revision 1.12  2000/03/28 19:43:18  roddey
  * Fixes for signed/unsigned warnings. New work for two way transcoding
  * stuff.
@@ -934,7 +937,7 @@ bool XMLReader::getUpToCharOrWS(XMLBuffer& toFill, const XMLCh toCheck)
 
     // We never hit any non-space and ate up the whole reader
     return false;
-    
+
 }
 
 
@@ -1529,7 +1532,7 @@ void XMLReader::doInitDecode()
             }
 
             //  First check that there are enough raw bytes for there to even
-            //  be a decl indentifier. If not, then nothing to do. 
+            //  be a decl indentifier. If not, then nothing to do.
             //
             if (fRawBytesAvail - fRawBufIndex < XMLRecognizer::fgUTF16PreLen)
             {
@@ -1661,8 +1664,7 @@ void XMLReader::refreshRawBuffer()
     //
     fRawBytesAvail = fStream->readBytes
     (
-        &fRawByteBuf[fRawBufIndex]
-        , kRawBufSize - bytesLeft
+        &fRawByteBuf[bytesLeft], kRawBufSize - bytesLeft
     ) + bytesLeft;
 
     //
@@ -1676,7 +1678,7 @@ void XMLReader::refreshRawBuffer()
 //
 //  This method is called internally when we run out of characters in the
 //  trancoded character buffer. We transcode up to another maxChars chars
-//  from the 
+//  from the
 //
 unsigned int
 XMLReader::xcodeMoreChars(          XMLCh* const            bufToFill