From 692aeadfe32d9aa9516cfdf7705b979db548d974 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Tue, 14 Aug 2018 02:16:37 +0000 Subject: Remove |bTakeOver| parameter from CFX_MemoryStream ctor. It is always true now. BUG=pdfium:263 Change-Id: I74fd0091f5815701718e8cd5acc6e7a0de772a85 Reviewed-on: https://pdfium-review.googlesource.com/40031 Reviewed-by: Tom Sepez Commit-Queue: Lei Zhang --- xfa/fgas/font/cfgas_fontmgr.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'xfa/fgas/font') diff --git a/xfa/fgas/font/cfgas_fontmgr.cpp b/xfa/fgas/font/cfgas_fontmgr.cpp index f173bf24ae..f6b168c89d 100644 --- a/xfa/fgas/font/cfgas_fontmgr.cpp +++ b/xfa/fgas/font/cfgas_fontmgr.cpp @@ -179,7 +179,8 @@ const FX_FONTDESCRIPTOR* CFGAS_FontMgr::FindFont(const wchar_t* pszFontFamily, // Use a named object to store the returned value of EnumGdiFonts() instead // of using a temporary object. This can prevent use-after-free issues since // pDesc may point to one of std::deque object's elements. - std::deque namedFonts = EnumGdiFonts(pszFontFamily, wUnicode); + std::deque namedFonts = + EnumGdiFonts(pszFontFamily, wUnicode); params.pwsFamily = nullptr; pDesc = MatchDefaultFont(¶ms, namedFonts); if (!pDesc) @@ -628,7 +629,7 @@ RetainPtr CFGAS_FontMgr::CreateFontStream( uint8_t* pBuffer = FX_Alloc(uint8_t, dwFileSize + 1); dwFileSize = pSystemFontInfo->GetFontData(hFont, 0, pBuffer, dwFileSize); - return pdfium::MakeRetain(pBuffer, dwFileSize, true); + return pdfium::MakeRetain(pBuffer, dwFileSize); } RetainPtr CFGAS_FontMgr::CreateFontStream( -- cgit v1.2.3