diff options
| author | Bo Xu <bo_xu@foxitsoftware.com> | 2014-06-30 09:49:21 -0700 |
|---|---|---|
| committer | Bo Xu <bo_xu@foxitsoftware.com> | 2014-06-30 09:49:21 -0700 |
| commit | 287e11a213d3197ac3e321acf294d903b271c269 (patch) | |
| tree | 28f6f9dd00331c2748d73f96d818ce04a9775e8d /core/src/fpdfdoc/doc_annot.cpp | |
| parent | ad30f609702d232f1708a0792d682c3cfaa0e235 (diff) | |
| download | pdfium-287e11a213d3197ac3e321acf294d903b271c269.tar.xz | |
Remove "this==NULL" and adjust corresponding callers
BUG=
R=thakis@chromium.org
Review URL: https://codereview.chromium.org/361553002
Diffstat (limited to 'core/src/fpdfdoc/doc_annot.cpp')
| -rw-r--r-- | core/src/fpdfdoc/doc_annot.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/src/fpdfdoc/doc_annot.cpp b/core/src/fpdfdoc/doc_annot.cpp index 227578a974..8952845570 100644 --- a/core/src/fpdfdoc/doc_annot.cpp +++ b/core/src/fpdfdoc/doc_annot.cpp @@ -165,7 +165,7 @@ void CPDF_Annot::ClearCachedAP() } CFX_ByteString CPDF_Annot::GetSubType() const { - return m_pAnnotDict->GetConstString(FX_BSTRC("Subtype")); + return m_pAnnotDict ? m_pAnnotDict->GetConstString(FX_BSTRC("Subtype")) : CFX_ByteStringC(); } void CPDF_Annot::GetRect(CPDF_Rect& rect) const { @@ -202,7 +202,8 @@ CPDF_Stream* FPDFDOC_GetAnnotAP(CPDF_Dictionary* pAnnotDict, CPDF_Annot::Appeara if (as.IsEmpty()) { CFX_ByteString value = pAnnotDict->GetString(FX_BSTRC("V")); if (value.IsEmpty()) { - value = pAnnotDict->GetDict(FX_BSTRC("Parent"))->GetString(FX_BSTRC("V")); + CPDF_Dictionary* pDict = pAnnotDict->GetDict(FX_BSTRC("Parent")); + value = pDict ? pDict->GetString(FX_BSTRC("V")) : CFX_ByteString(); } if (value.IsEmpty() || !((CPDF_Dictionary*)psub)->KeyExist(value)) { as = FX_BSTRC("Off"); |