Remove "this==NULL" and adjust corresponding callers

fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp

Index: fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp
diff --git a/fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp b/fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp
index 0c7cd4855354f00f4e818a4ff326f2e78e3b9c78..8de5d6d093e2dac5c3798b9cbb1fe234bf95cff2 100644
--- a/fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp
+++ b/fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp
@@ -239,16 +239,12 @@ CPDF_Font* CBA_FontMap::GetAnnotDefaultFont(CFX_ByteString &sAlias)
 	}
 	
 	CFX_ByteString sDA;
-	
-	sDA = FPDF_GetFieldAttr(m_pAnnotDict, "DA")->GetString();
+	CPDF_Object* pObj;
+	if ( pObj = FPDF_GetFieldAttr(m_pAnnotDict, "DA"))
+		sDA = pObj->GetString();
 
-	if (bWidget)
-	{
-		if (sDA.IsEmpty())
-		{
-			sDA = FPDF_GetFieldAttr(pAcroFormDict, "DA")->GetString();	
-		}
-	}
+	if (bWidget && sDA.IsEmpty() && (pObj = FPDF_GetFieldAttr(pAcroFormDict, "DA")))

[Nico, 2014/06/28 01:01:07]

I don't know if it matters, but this changes behavior: Previoulsy, if bWidget &&
sDA.IsEmpty(), then if !FPDF_GetFieldAttr(pAcroFormDict, "DA") would get
overwritten with an empty byte string. Now it retains the value it had before.

[Bo Xu, 2014/06/28 01:52:30]

You are right, this should be adjusted.

On 2014/06/28 01:01:07, Nico (away) wrote:

+		sDA =  pObj->GetString();
 	
 	CPDF_Dictionary * pFontDict = NULL;