From 8698aff8381399e82bafa892ed9f0e605065e45c Mon Sep 17 00:00:00 2001
From: Lei Zhang <thestig@chromium.org>
Date: Mon, 9 Nov 2015 09:59:02 -0800
Subject: Merge to XFA: Add some nullptr checks that were missing from commit
 f7992b39.

BUG=pdfium:268
TBR=tsepez@chromium.org

Review URL: https://codereview.chromium.org/1425293010 .

(cherry picked from commit a8f5b7b5e7501bdcfba585fc8af76c4a0fab22cb)

Review URL: https://codereview.chromium.org/1418823008 .
---
 core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp')

diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp
index e49835496c..e8b300027c 100644
--- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp
+++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp
@@ -851,7 +851,8 @@ FX_BOOL CPDF_Parser::RebuildCrossRef() {
                           CFX_ByteString key;
                           CPDF_Object* pElement =
                               pTrailer->GetNextElement(pos, key);
-                          FX_DWORD dwObjNum = pElement->GetObjNum();
+                          FX_DWORD dwObjNum =
+                              pElement ? pElement->GetObjNum() : 0;
                           if (dwObjNum) {
                             m_pTrailer->SetAtReference(key, m_pDocument,
                                                        dwObjNum);
-- 
cgit v1.2.3