diff options
| author | Tom Sepez <tsepez@chromium.org> | 2018-07-28 00:00:24 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-07-28 00:00:24 +0000 |
| commit | f19ae5dcd0b618cdeb80d6a1df5b13610d0ff7da (patch) | |
| tree | 6e834ca7ebaff809e6e8d352c41bb1f8d4ec4203 /core/fxcrt/xml/cfx_xmlparser.cpp | |
| parent | 0415e02db77da26495dc0fbd80de76ce1d777585 (diff) | |
| download | pdfium-f19ae5dcd0b618cdeb80d6a1df5b13610d0ff7da.tar.xz | |
Add ToXML{Instruction,Text,CharData}() checked conversion functions
All usages were previously checked correctly, but this consolidates
some code as well.
Change-Id: I63711748b31b698a3f21f98fdb536db1e9e0b1cf
Reviewed-on: https://pdfium-review.googlesource.com/39010
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'core/fxcrt/xml/cfx_xmlparser.cpp')
| -rw-r--r-- | core/fxcrt/xml/cfx_xmlparser.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/core/fxcrt/xml/cfx_xmlparser.cpp b/core/fxcrt/xml/cfx_xmlparser.cpp index dd28cf8adc..094daac889 100644 --- a/core/fxcrt/xml/cfx_xmlparser.cpp +++ b/core/fxcrt/xml/cfx_xmlparser.cpp @@ -518,12 +518,10 @@ void CFX_XMLParser::ProcessTargetData() { WideString target_data = GetTextData(); if (target_data.IsEmpty()) return; - if (!current_node_) - return; - if (current_node_->GetType() != FX_XMLNODE_Instruction) - return; - static_cast<CFX_XMLInstruction*>(current_node_)->AppendData(target_data); + CFX_XMLInstruction* instruction = ToXMLInstruction(current_node_); + if (instruction) + instruction->AppendData(target_data); } WideString CFX_XMLParser::GetTextData() { |