From 8698aff8381399e82bafa892ed9f0e605065e45c Mon Sep 17 00:00:00 2001 From: Lei Zhang 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_page/fpdf_page_parser_old.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core/src/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp') diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp index 187d6152e9..9adfdb21a4 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp @@ -92,7 +92,7 @@ void CPDF_StreamContentParser::Handle_BeginImage() { nonstd::unique_ptr> pObj( m_pSyntax->ReadNextObject()); if (!key.IsEmpty()) { - FX_DWORD dwObjNum = pObj->GetObjNum(); + FX_DWORD dwObjNum = pObj ? pObj->GetObjNum() : 0; if (dwObjNum) pDict->SetAtReference(key, m_pDocument, dwObjNum); else -- cgit v1.2.3