Adjust null object check

core/src/fpdfdoc/doc_formfield.cpp

Index: core/src/fpdfdoc/doc_formfield.cpp
diff --git a/core/src/fpdfdoc/doc_formfield.cpp b/core/src/fpdfdoc/doc_formfield.cpp
index e51acf94a111a5216045773ba04e45fe918db420..5715c20fdfc48b3287c9e3defaa1626418e98432 100644
--- a/core/src/fpdfdoc/doc_formfield.cpp
+++ b/core/src/fpdfdoc/doc_formfield.cpp
@@ -1077,9 +1077,12 @@ FX_BOOL CPDF_FormField::ClearSelectedOptions(FX_BOOL bNotify)
 }
 void CPDF_FormField::LoadDA()
 {
-    CFX_ByteString DA = FPDF_GetFieldAttr(m_pDict, "DA") ? FPDF_GetFieldAttr(m_pDict, "DA")->GetString() : CFX_ByteString();
-    if (DA.IsEmpty()) {
-        DA = m_pForm->m_pFormDict ? m_pForm->m_pFormDict->GetString("DA") : CFX_ByteString();
+    CFX_ByteString DA;
+    if (CPDF_Object* pObj_t = FPDF_GetFieldAttr(m_pDict, "DA")){

[Nico, 2014/07/21 16:48:12]

nit: add the same space here

[Bo Xu, 2014/07/21 17:01:29]

Done.

+        DA = pObj_t->GetString();
+    }
+    if (DA.IsEmpty() && m_pForm->m_pFormDict) {
+        DA = m_pForm->m_pFormDict->GetString("DA");;

[Nico, 2014/07/21 16:48:12]

nit: there's one ; too many here

[Bo Xu, 2014/07/21 17:01:30]

Done.

     }
     if (DA.IsEmpty()) {
         return;