commit 1c6f2ae03ac7c77cab798871d03c2aa31c359886
author Lei Zhang <thestig@chromium.org> Thu Oct 24 19:26:05 2024 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Oct 24 19:26:05 2024 +0000
tree fb31d3c3be256096229870fa3a1ba10e59b7ce95
parent 910e2f41f127a222541d71f9a9475c245a19fc1d

Avoid CHECK() failure in CXFA_Document::DataMerge_CopyContainer()

- Update cheap DCHECK() in DataMerge_CopyContainer() to a CHECK()
- Change offending caller to avoid the CHECK() failure.

Bug: 332930108
Change-Id: I6ae439383dd20129f4eab525b7c8b4d7e65452a4
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/125370
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Thomas Sepez <tsepez@google.com>
Commit-Queue: Lei Zhang <thestig@chromium.org>

xfa/fxfa/layout/cxfa_viewlayoutprocessor.cpp

diff --git a/xfa/fxfa/layout/cxfa_viewlayoutprocessor.cpp b/xfa/fxfa/layout/cxfa_viewlayoutprocessor.cpp
index 131ea4d..764b54c 100644
--- a/xfa/fxfa/layout/cxfa_viewlayoutprocessor.cpp
+++ b/xfa/fxfa/layout/cxfa_viewlayoutprocessor.cpp
@@ -921,15 +921,17 @@
   CXFA_Node* pFormNode = pBookendNode->GetContainerParent();
   CXFA_Node* pLeaderTemplate =
       ResolveBookendLeaderOrTrailer(pBookendNode, bLeader);
-  if (!pLeaderTemplate)
+  if (!pLeaderTemplate || !pLeaderTemplate->IsContainerNode()) {
     return nullptr;
+  }
 
   CXFA_Document* pDocument = pBookendNode->GetDocument();
   CXFA_Node* pDataScope = XFA_DataMerge_FindDataScope(pFormNode);
   CXFA_Node* pBookendAppendNode = pDocument->DataMerge_CopyContainer(
       pLeaderTemplate, pFormNode, pDataScope, true, true, true);
-  if (!pBookendAppendNode)
+  if (!pBookendAppendNode) {
     return nullptr;
+  }
 
   pDocument->DataMerge_UpdateBindingRelations(pBookendAppendNode);
   SetLayoutGeneratedNodeFlag(pBookendAppendNode);

xfa/fxfa/parser/cxfa_document.cpp

diff --git a/xfa/fxfa/parser/cxfa_document.cpp b/xfa/fxfa/parser/cxfa_document.cpp
index 43a957d..8be64a4 100644
--- a/xfa/fxfa/parser/cxfa_document.cpp
+++ b/xfa/fxfa/parser/cxfa_document.cpp
@@ -1629,7 +1629,7 @@
                                                   bool bOneInstance,
                                                   bool bDataMerge,
                                                   bool bUpLevel) {
-  DCHECK(pTemplateNode->IsContainerNode());
+  CHECK(pTemplateNode->IsContainerNode());
   switch (pTemplateNode->GetElementType()) {
     case XFA_Element::Area:
     case XFA_Element::PageArea: