From ba367068887aca9f700289aa1b8c198920ca39a2 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Tue, 1 May 2018 17:02:54 +0000 Subject: Fixes XML Instruction handling in CXFA_DocumentParser. This CL fixes issues with handling XML instructions in CXFA_DocumentParser. Unittests were added to verify the behaviour. Change-Id: Iff8d51d0e6d411419473c9b2c32c700d4bbf86f5 Reviewed-on: https://pdfium-review.googlesource.com/31810 Commit-Queue: dsinclair Reviewed-by: Ryan Harrison Reviewed-by: Henrique Nakashima --- core/fxcrt/xml/cfx_xmlparser.cpp | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'core') diff --git a/core/fxcrt/xml/cfx_xmlparser.cpp b/core/fxcrt/xml/cfx_xmlparser.cpp index cbfb949705..c7a81afc16 100644 --- a/core/fxcrt/xml/cfx_xmlparser.cpp +++ b/core/fxcrt/xml/cfx_xmlparser.cpp @@ -175,8 +175,6 @@ bool CFX_XMLParser::Parse() { auto* instruction = static_cast(m_pChild); if (!target_data.IsEmpty()) instruction->AppendData(target_data); - if (!GetTextData().IsEmpty()) - instruction->AppendData(GetTextData()); } break; } @@ -248,18 +246,27 @@ FX_XmlSyntaxResult CFX_XMLParser::DoSyntaxParse() { } break; case FDE_XmlSyntaxState::Target: - case FDE_XmlSyntaxState::Tag: if (!IsXMLNameChar(ch, current_text_.empty())) { if (current_text_.empty()) { m_syntaxParserResult = FX_XmlSyntaxResult::Error; return m_syntaxParserResult; } - if (m_syntaxParserState != FDE_XmlSyntaxState::Target) - syntaxParserResult = FX_XmlSyntaxResult::TagName; - else - syntaxParserResult = FX_XmlSyntaxResult::TargetName; + syntaxParserResult = FX_XmlSyntaxResult::TargetName; + m_syntaxParserState = FDE_XmlSyntaxState::TargetData; + } else { + current_text_.push_back(ch); + m_Start++; + } + break; + case FDE_XmlSyntaxState::Tag: + if (!IsXMLNameChar(ch, current_text_.empty())) { + if (current_text_.empty()) { + m_syntaxParserResult = FX_XmlSyntaxResult::Error; + return m_syntaxParserResult; + } + syntaxParserResult = FX_XmlSyntaxResult::TagName; m_syntaxParserState = FDE_XmlSyntaxState::AttriName; } else { current_text_.push_back(ch); @@ -486,7 +493,6 @@ FX_XmlSyntaxResult CFX_XMLParser::DoSyntaxParse() { break; } if (m_wQuotationMark == 0) { - m_wQuotationMark = 0; m_Start++; syntaxParserResult = FX_XmlSyntaxResult::TargetData; break; -- cgit v1.2.3