summaryrefslogtreecommitdiff
path: root/core/fpdfapi/font/cpdf_font.cpp
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2017-04-25 16:39:34 -0700
committerChromium commit bot <commit-bot@chromium.org>2017-04-26 00:05:22 +0000
commit012ae898a069bda7afbfdad4eb4c8ba042b68dc7 (patch)
tree9a8e9e05e2fe6fd127b781dbb55b8793eea2d92e /core/fpdfapi/font/cpdf_font.cpp
parent5c42c8e9b78082319ad57f143ad03037d447aa36 (diff)
downloadpdfium-012ae898a069bda7afbfdad4eb4c8ba042b68dc7.tar.xz
Get rid of a few |new|s in CPDF_Document.
The chain of destructors may attempt to use m_pDocPage after it has been set to null by the unique_ptr destructor. Verify it is still present before using it from any code that may be called from some other CPDF_ destructor. Change-Id: I007160231d73feed85d90efc687d6da993653f96 Reviewed-on: https://pdfium-review.googlesource.com/4499 Reviewed-by: Lei Zhang <thestig@chromium.org> Commit-Queue: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'core/fpdfapi/font/cpdf_font.cpp')
-rw-r--r--core/fpdfapi/font/cpdf_font.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/core/fpdfapi/font/cpdf_font.cpp b/core/fpdfapi/font/cpdf_font.cpp
index b9be3aa868..53186daec6 100644
--- a/core/fpdfapi/font/cpdf_font.cpp
+++ b/core/fpdfapi/font/cpdf_font.cpp
@@ -61,8 +61,11 @@ CPDF_Font::CPDF_Font()
CPDF_Font::~CPDF_Font() {
if (m_pFontFile) {
- m_pDocument->GetPageData()->MaybePurgeFontFileStreamAcc(
- m_pFontFile->GetStream()->AsStream());
+ auto* pPageData = m_pDocument->GetPageData();
+ if (pPageData) {
+ pPageData->MaybePurgeFontFileStreamAcc(
+ m_pFontFile->GetStream()->AsStream());
+ }
}
}