From 11ac93cfdb9f4f25eee2ba60b947f992ab40ec54 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Thu, 31 Mar 2016 09:45:20 -0700 Subject: Fix CData parsing in CFDE_XMLSyntaxParser. This CL splits the handling of CData sections out to an individual phase of the parser. This fixes the issue with the CData parser getting confused by < characters inside the data section. BUG=pdfium:90 Review URL: https://codereview.chromium.org/1842633004 --- xfa/fgas/crt/fgas_stream.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'xfa/fgas/crt/fgas_stream.cpp') diff --git a/xfa/fgas/crt/fgas_stream.cpp b/xfa/fgas/crt/fgas_stream.cpp index 8ab2f9fd37..94468e23da 100644 --- a/xfa/fgas/crt/fgas_stream.cpp +++ b/xfa/fgas/crt/fgas_stream.cpp @@ -870,8 +870,9 @@ int32_t CFX_BufferStreamImp::ReadString(FX_WCHAR* pStr, } 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); @@ -1345,6 +1346,7 @@ int32_t CFX_Stream::ReadString(FX_WCHAR* pStr, } return iLen; } + int32_t CFX_Stream::WriteData(const uint8_t* pBuffer, int32_t iBufferSize) { FXSYS_assert(pBuffer != NULL && iBufferSize > 0); if (m_pStreamImp == NULL) { -- cgit v1.2.3