commit 011147f5b36f401dc40036851613e5eaba7bab03
author Tom Sepez <tsepez@chromium.org> Mon Feb 11 17:45:53 2019 +0000
committer Chromium commit bot <commit-bot@chromium.org> Mon Feb 11 17:45:53 2019 +0000
tree 05799a4ecc5df886e86775cacac0dff4135cd8f2
parent 27a3c7755b4d5a7ee7266691e8c4fe2abf8f325d

Add null test before inserting in DoLayoutFlowedContainer()

The change at revision 3c90892 disallowed inserting null objects
into these linked lists which were previously silently tolerated,
so an explicit null check is required.

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

xfa/fxfa/layout/cxfa_itemlayoutprocessor.cpp

diff --git a/xfa/fxfa/layout/cxfa_itemlayoutprocessor.cpp b/xfa/fxfa/layout/cxfa_itemlayoutprocessor.cpp
index 324ad35..092f802 100644
--- a/xfa/fxfa/layout/cxfa_itemlayoutprocessor.cpp
+++ b/xfa/fxfa/layout/cxfa_itemlayoutprocessor.cpp
@@ -1718,7 +1718,8 @@
         if (!pLayoutNext->m_pNextSibling && m_pCurChildPreprocessor &&
             m_pCurChildPreprocessor->GetFormNode() ==
                 pLayoutNext->GetFormNode()) {
-          pLayoutNext->InsertAfter(m_pCurChildPreprocessor->m_pLayoutItem);
+          if (m_pCurChildPreprocessor->m_pLayoutItem)
+            pLayoutNext->InsertAfter(m_pCurChildPreprocessor->m_pLayoutItem);
           m_pCurChildPreprocessor->m_pLayoutItem = pLayoutNext;
           break;
         }