From 91177a4d73be70344caab2a62f6610672165207f Mon Sep 17 00:00:00 2001 From: Jun Fang Date: Mon, 18 Aug 2014 11:30:19 -0700 Subject: Add a null check before getting unicode text in CPDF_FormField::GetValue The test pdf file defines an invalid dictionary object with a NULL arrary in the filed of "/V". It causes that a NULL object is returned when trying to get the first element of this arrary. So it needs to check whether the returned object is NULL. BUG=395986 R=tsepez@chromium.org Review URL: https://codereview.chromium.org/478183002 --- core/src/fpdfdoc/doc_formfield.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/src/fpdfdoc/doc_formfield.cpp b/core/src/fpdfdoc/doc_formfield.cpp index eeba372390..a2f0fbd297 100644 --- a/core/src/fpdfdoc/doc_formfield.cpp +++ b/core/src/fpdfdoc/doc_formfield.cpp @@ -324,7 +324,9 @@ CFX_WideString CPDF_FormField::GetValue(FX_BOOL bDefault) return pValue->GetUnicodeText(); case PDFOBJ_ARRAY: pValue = ((CPDF_Array*)pValue)->GetElementValue(0); - return pValue->GetUnicodeText(); + if (pValue) { + return pValue->GetUnicodeText(); + } break; } return CFX_WideString(); -- cgit v1.2.3