diff options
| author | Tom Sepez <tsepez@chromium.org> | 2017-05-16 14:01:47 -0700 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-05-16 21:29:40 +0000 |
| commit | cc205131b021ebded854958973f445ed121da1b8 (patch) | |
| tree | 18abcb19e5ec70dc8079cc7ad5192a5ff50aaf27 /core/fxge | |
| parent | d3a3cc24a034654b0825e4822446ddfc6a22c045 (diff) | |
| download | pdfium-cc205131b021ebded854958973f445ed121da1b8.tar.xz | |
Introduce CFX_UnownedPtr to detect lifetime inversion issues.
There are places where an object "child" has a raw pointer
back to object "owner" with the understanding that owner will
always outlive child.
Violating this constraint can lead to use after free, but this
requires finding two paths: one that frees the objects in the
wrong order, and one that uses the object after the free. The
purpose of this patch is to detect the constraint violation
even when the second path is not hit.
We create a template that is used in place of TYPE*. It's dtor,
when a memory tool is present, goes out and probes the first
byte of the object to which it points. Used in "child", this
allows the memory tool to prove that the "owner" is still alive
at the time the child is destroyed, and hence the constraint is
never violated.
Change-Id: I2a6d696d51dda4a79ee2f00a6752965e058a6417
Reviewed-on: https://pdfium-review.googlesource.com/5475
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'core/fxge')
| -rw-r--r-- | core/fxge/fx_font.h | 3 | ||||
| -rw-r--r-- | core/fxge/ge/cfx_font.cpp | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/core/fxge/fx_font.h b/core/fxge/fx_font.h index ce91e27c42..946c713418 100644 --- a/core/fxge/fx_font.h +++ b/core/fxge/fx_font.h @@ -11,6 +11,7 @@ #include <utility> #include <vector> +#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_system.h" #include "core/fxge/cfx_substfont.h" #include "core/fxge/dib/cfx_dibitmap.h" @@ -172,7 +173,7 @@ class CFX_Font { void ClearFaceCache(); FXFT_Face m_Face; - mutable CFX_FaceCache* m_FaceCache; // not owned. + mutable CFX_UnownedPtr<CFX_FaceCache> m_FaceCache; std::unique_ptr<CFX_SubstFont> m_pSubstFont; std::vector<uint8_t> m_pFontDataAllocation; uint8_t* m_pFontData; diff --git a/core/fxge/ge/cfx_font.cpp b/core/fxge/ge/cfx_font.cpp index 2ae34f11b9..18baed9d09 100644 --- a/core/fxge/ge/cfx_font.cpp +++ b/core/fxge/ge/cfx_font.cpp @@ -537,10 +537,9 @@ int CFX_Font::GetMaxAdvanceWidth() const { } CFX_FaceCache* CFX_Font::GetFaceCache() const { - if (!m_FaceCache) { + if (!m_FaceCache) m_FaceCache = CFX_GEModule::Get()->GetFontCache()->GetCachedFace(this); - } - return m_FaceCache; + return m_FaceCache.Get(); } void CFX_Font::ClearFaceCache() { |