commit 0c32f02cf5dabd80c03f3af34874b5f84535b1ef
author Bo Xu <bo_xu@foxitsoftware.com> Fri Nov 14 17:22:13 2014 -0800
committer Bo Xu <bo_xu@foxitsoftware.com> Fri Nov 14 17:22:13 2014 -0800
tree 98a8306a1e87ffaabcab4beba46c011b29a2357f
parent a197ba486d3b9a87956477ed867a3ebf8ee74f56

Check NULL pointer dereferencing from GetDirect

BUG=431770
R=tsepez@chromium.org

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

xfa/src/fxfa/src/app/xfa_ffdoc.cpp

diff --git a/xfa/src/fxfa/src/app/xfa_ffdoc.cpp b/xfa/src/fxfa/src/app/xfa_ffdoc.cpp
index 9c68603..625a34d 100644
--- a/xfa/src/fxfa/src/app/xfa_ffdoc.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffdoc.cpp
@@ -233,15 +233,11 @@
     if (pAcroForm == NULL) {

         return FALSE;

     }

-    CPDF_Object* pElementXFA = pAcroForm->GetElement(FX_BSTRC("XFA"));

+    CPDF_Object* pElementXFA = pAcroForm->GetElementValue(FX_BSTRC("XFA"));

     if (pElementXFA == NULL) {

         return FALSE;

     }

     FX_INT32 iObjType = pElementXFA->GetType();

-    if (iObjType == PDFOBJ_REFERENCE) {

-        pElementXFA = pElementXFA->GetDirect();

-        iObjType = pElementXFA->GetType();

-    }

     CFX_ArrayTemplate<CPDF_Stream*> xfaStreams;

     if (iObjType == PDFOBJ_ARRAY) {

         CPDF_Array* pXFAArray = (CPDF_Array*)pElementXFA;