Fix CData parsing in CFDE_XMLSyntaxParser.

xfa/fgas/crt/fgas_stream.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "xfa/fgas/crt/fgas_stream.h"
 
 #include <algorithm>
 
@@ skipping 852 matching lines @@
                                         int32_t iMaxLength,
                                         FX_BOOL& bEOS) {
   FXSYS_assert(m_pData != NULL);
   FXSYS_assert(pStr != NULL && iMaxLength > 0);
   int32_t iLen = std::min((m_iLength - m_iPosition) / 2, iMaxLength);
   if (iLen <= 0) {
     return 0;
   }
   const FX_WCHAR* pSrc = (const FX_WCHAR*)(FX_CHAR*)(m_pData + m_iPosition);
   int32_t iCount = 0;
-  while (*pSrc != L'\0' && iCount < iLen) {
-    *pStr++ = *pSrc++, iCount++;
+  while (*pSrc && iCount < iLen) {
+    *pStr++ = *pSrc++;
+    iCount++;
   }
   m_iPosition += iCount * 2;
   bEOS = (*pSrc == L'\0') || (m_iPosition >= m_iLength);
   return iCount;
 }
 int32_t CFX_BufferStreamImp::WriteData(const uint8_t* pBuffer,
                                        int32_t iBufferSize) {
   FXSYS_assert(m_pData != NULL && (m_dwAccess & FX_STREAMACCESS_Write) != 0);
   FXSYS_assert(pBuffer != NULL && iBufferSize > 0);
   int32_t iLen = std::min(m_iTotalSize - m_iPosition, iBufferSize);
@@ skipping 453 matching lines @@
   if (m_pStreamImp->GetPosition() != m_iPosition) {
     m_pStreamImp->Seek(FX_STREAMSEEK_Begin, m_iPosition);
   }
   iLen = m_pStreamImp->ReadString(pStr, iLen, bEOS);
   m_iPosition = m_pStreamImp->GetPosition();
   if (iLen > 0 && m_iPosition >= iEnd) {
     bEOS = TRUE;
   }
   return iLen;
 }
+
 int32_t CFX_Stream::WriteData(const uint8_t* pBuffer, int32_t iBufferSize) {
   FXSYS_assert(pBuffer != NULL && iBufferSize > 0);
   if (m_pStreamImp == NULL) {
     return -1;
   }
   if ((m_dwAccess & FX_STREAMACCESS_Write) == 0) {
     return -1;
   }
   int32_t iLen = iBufferSize;
   if (m_eStreamType == FX_STREAMTYPE_Stream) {
@@ skipping 259 matching lines @@
   return m_pStream->WriteData((const uint8_t*)pData, (int32_t)size) ==
          (int32_t)size;
 }
 FX_BOOL CFGAS_FileWrite::WriteBlock(const void* pData,
                                     FX_FILESIZE offset,
                                     size_t size) {
   m_pStream->Seek(FX_STREAMSEEK_Begin, offset);
   int32_t iLen = m_pStream->WriteData((uint8_t*)pData, (int32_t)size);
   return iLen == (int32_t)size;
 }