diff options
| author | Lei Zhang <thestig@chromium.org> | 2018-08-14 02:16:37 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-08-14 02:16:37 +0000 |
| commit | 692aeadfe32d9aa9516cfdf7705b979db548d974 (patch) | |
| tree | 2e4021d7054aa6ec606f624e7bb525ca2b3a6302 /xfa/fgas/font/cfgas_fontmgr.cpp | |
| parent | ed176992eb7ddbb0fee7b79625501df06f8ccf93 (diff) | |
| download | pdfium-692aeadfe32d9aa9516cfdf7705b979db548d974.tar.xz | |
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 <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'xfa/fgas/font/cfgas_fontmgr.cpp')
| -rw-r--r-- | xfa/fgas/font/cfgas_fontmgr.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
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<FX_FONTDESCRIPTOR> namedFonts = EnumGdiFonts(pszFontFamily, wUnicode); + std::deque<FX_FONTDESCRIPTOR> namedFonts = + EnumGdiFonts(pszFontFamily, wUnicode); params.pwsFamily = nullptr; pDesc = MatchDefaultFont(¶ms, namedFonts); if (!pDesc) @@ -628,7 +629,7 @@ RetainPtr<IFX_SeekableReadStream> CFGAS_FontMgr::CreateFontStream( uint8_t* pBuffer = FX_Alloc(uint8_t, dwFileSize + 1); dwFileSize = pSystemFontInfo->GetFontData(hFont, 0, pBuffer, dwFileSize); - return pdfium::MakeRetain<CFX_MemoryStream>(pBuffer, dwFileSize, true); + return pdfium::MakeRetain<CFX_MemoryStream>(pBuffer, dwFileSize); } RetainPtr<IFX_SeekableReadStream> CFGAS_FontMgr::CreateFontStream( |