From 23b2d61fdd1f78679c6bb375bb9dde666cf7cc3f Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Wed, 17 Oct 2018 16:42:32 +0000 Subject: Fix the static initialization order problem for PartitionAlloc. Inside fx_memory.cpp, the PartitionAllocatorGeneric objects are globals, so their initialization order is not well defined. BUG=chromium:896117 Change-Id: If4a345d6d7549b0e99a055859eaa67d5ec32c788 Reviewed-on: https://pdfium-review.googlesource.com/c/44170 Reviewed-by: Tom Sepez Commit-Queue: Lei Zhang --- core/fxcrt/string_data_template.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'core/fxcrt/string_data_template.h') diff --git a/core/fxcrt/string_data_template.h b/core/fxcrt/string_data_template.h index 0fe679d243..656d3501e1 100644 --- a/core/fxcrt/string_data_template.h +++ b/core/fxcrt/string_data_template.h @@ -36,8 +36,8 @@ class StringDataTemplate { size_t usableLen = (totalSize - overhead) / sizeof(CharType); ASSERT(usableLen >= nLen); - void* pData = gStringPartitionAllocator.root()->Alloc(totalSize, - "StringDataTemplate"); + void* pData = GetStringPartitionAllocator().root()->Alloc( + totalSize, "StringDataTemplate"); return new (pData) StringDataTemplate(nLen, usableLen); } @@ -50,7 +50,7 @@ class StringDataTemplate { void Retain() { ++m_nRefs; } void Release() { if (--m_nRefs <= 0) - gStringPartitionAllocator.root()->Free(this); + GetStringPartitionAllocator().root()->Free(this); } bool CanOperateInPlace(size_t nTotalLen) const { -- cgit v1.2.3