commit 1dc3e9e08547ad33c58591253fae7c8fbf1c5273
author Lei Zhang <thestig@chromium.org> Wed Dec 04 18:10:53 2019 +0000
committer Chromium commit bot <commit-bot@chromium.org> Wed Dec 04 18:10:53 2019 +0000
tree 933c006cf9595afa3a4c6968dbc6d5657a99657d
parent da2cf01c82657af13364fdf4c08eec13957ff58c

Fix nits in CFX_XMLParser::DoSyntaxParse().

- Perform size checks slightly more efficiently at the beginning.
- Mark the end of the function as NOTREACHED(), since it follows a
  while(true) loop with no breaks.

Change-Id: I7cd2d4236974b20e6ab6c80387de3707b7315d57
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/63130
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>

core/fxcrt/xml/cfx_xmlparser.cpp

diff --git a/core/fxcrt/xml/cfx_xmlparser.cpp b/core/fxcrt/xml/cfx_xmlparser.cpp
index 2dcfd9b..9393bbd 100644
--- a/core/fxcrt/xml/cfx_xmlparser.cpp
+++ b/core/fxcrt/xml/cfx_xmlparser.cpp
@@ -87,17 +87,19 @@
 }
 
 bool CFX_XMLParser::DoSyntaxParse(CFX_XMLDocument* doc) {
-  FX_FILESIZE current_buffer_idx = 0;
-  FX_FILESIZE buffer_size = 0;
+  if (xml_plane_size_ <= 0)
+    return false;
 
   FX_SAFE_SIZE_T alloc_size_safe = xml_plane_size_;
   alloc_size_safe += 1;  // For NUL.
-  if (!alloc_size_safe.IsValid() || alloc_size_safe.ValueOrDie() <= 0 ||
-      xml_plane_size_ <= 0)
+  if (!alloc_size_safe.IsValid())
     return false;
 
+  FX_FILESIZE current_buffer_idx = 0;
+  FX_FILESIZE buffer_size = 0;
+
   std::vector<wchar_t, FxAllocAllocator<wchar_t>> buffer;
-  buffer.resize(pdfium::base::ValueOrDieForType<size_t>(alloc_size_safe));
+  buffer.resize(alloc_size_safe.ValueOrDie());
 
   std::stack<wchar_t> character_to_skip_too_stack;
   std::stack<CFX_XMLNode::Type> node_type_stack;
@@ -461,8 +463,8 @@
     }
   }
 
-  current_node_->AppendLastChild(doc->CreateNode<CFX_XMLText>(GetTextData()));
-  return true;
+  NOTREACHED();
+  return false;
 }
 
 void CFX_XMLParser::ProcessTextChar(wchar_t character) {