From a3cf977f974c67bd2cef8dee5b810784bfc21336 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 16 May 2017 15:57:26 -0700 Subject: CFX_UnownedPtr: check during assignment time as well. In particular, doing m_pPtr = nullptr; in your dtor to evade this check will not longer work. Fix slight mis-ordering observeds in CFX_Font and CPDFXFA_Context. Change-Id: I3e6137159430333b091364021283a54a13d916b5 Reviewed-on: https://pdfium-review.googlesource.com/5570 Reviewed-by: Lei Zhang Commit-Queue: Tom Sepez --- core/fxcrt/cfx_unowned_ptr.h | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'core/fxcrt/cfx_unowned_ptr.h') diff --git a/core/fxcrt/cfx_unowned_ptr.h b/core/fxcrt/cfx_unowned_ptr.h index 11f4e8e38b..bc58144335 100644 --- a/core/fxcrt/cfx_unowned_ptr.h +++ b/core/fxcrt/cfx_unowned_ptr.h @@ -26,17 +26,20 @@ class CFX_UnownedPtr { CFX_UnownedPtr(std::nullptr_t ptr) {} #if defined(MEMORY_TOOL_REPLACES_ALLOCATOR) - ~CFX_UnownedPtr() { - if (m_pObj) - reinterpret_cast(m_pObj)[0]; - } + ~CFX_UnownedPtr() { Probe(); } #endif CFX_UnownedPtr& operator=(T* that) { +#if defined(MEMORY_TOOL_REPLACES_ALLOCATOR) + Probe(); +#endif m_pObj = that; return *this; } CFX_UnownedPtr& operator=(const CFX_UnownedPtr& that) { +#if defined(MEMORY_TOOL_REPLACES_ALLOCATOR) + Probe(); +#endif if (*this != that) m_pObj = that.Get(); return *this; @@ -58,6 +61,13 @@ class CFX_UnownedPtr { T* operator->() const { return m_pObj; } private: +#if defined(MEMORY_TOOL_REPLACES_ALLOCATOR) + void Probe() { + if (m_pObj) + reinterpret_cast(m_pObj)[0]; + } +#endif + T* m_pObj = nullptr; }; -- cgit v1.2.3