From 287e11a213d3197ac3e321acf294d903b271c269 Mon Sep 17 00:00:00 2001 From: Bo Xu Date: Mon, 30 Jun 2014 09:49:21 -0700 Subject: Remove "this==NULL" and adjust corresponding callers BUG= R=thakis@chromium.org Review URL: https://codereview.chromium.org/361553002 --- fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'fpdfsdk/src/formfiller') diff --git a/fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp b/fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp index 0c7cd48553..8e10cc22e3 100644 --- a/fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp +++ b/fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp @@ -239,14 +239,16 @@ 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(); + pObj = FPDF_GetFieldAttr(pAcroFormDict, "DA"); + sDA = pObj ? pObj->GetString() : CFX_ByteString(); } } -- cgit v1.2.3