From 827a1722f70e7092270b5e0fdfba1e9c0b1ac50f Mon Sep 17 00:00:00 2001 From: JUN FANG Date: Thu, 5 Mar 2015 13:39:21 -0800 Subject: Check whether a pdf has XFA fields before loading XFA fields BUG=452793 R=tsepez@chromium.org Review URL: https://codereview.chromium.org/973673002 --- samples/pdfium_test.cc | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'samples') diff --git a/samples/pdfium_test.cc b/samples/pdfium_test.cc index d861f2f5c9..e4a55f27ff 100644 --- a/samples/pdfium_test.cc +++ b/samples/pdfium_test.cc @@ -468,12 +468,21 @@ void RenderPdf(const std::string& name, const char* pBuf, size_t len, doc = FPDFAvail_GetDocument(pdf_avail, NULL); } + if (!doc) + { + fprintf(stderr, "Load pdf docs unsuccessful.\n"); + return; + } + (void) FPDF_GetDocPermissions(doc); (void) FPDFAvail_IsFormAvail(pdf_avail, &hints); FPDF_FORMHANDLE form = FPDFDOC_InitFormFillEnvironment(doc, &form_callbacks); - if (!FPDF_LoadXFA(doc)) { - fprintf(stderr, "LoadXFA unsuccessful, continuing anyway.\n"); + int docType = DOCTYPE_PDF; + if (FPDF_HasXFAField(doc, docType)) + { + if (docType != DOCTYPE_PDF && !FPDF_LoadXFA(doc)) + fprintf(stderr, "LoadXFA unsuccessful, continuing anyway.\n"); } FPDF_SetFormFieldHighlightColor(form, 0, 0xFFE4DD); FPDF_SetFormFieldHighlightAlpha(form, 100); -- cgit v1.2.3