ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

tdf#159680 fix memory leak of CTFontRef

Browse Source 
The CTFontRef in CoreTextFontFace::GetVariations() was never
released and a new CTFontRef was allocated in every call to
CoreTextFontFace::GetVariations(). So release the CTFontRef
and only allocate it once when mxVariations is populated.

Change-Id: I08999956501d5860fff67e48001ef85a62ca8079
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169690
Tested-by: Jenkins
Reviewed-by: Patrick Luby <guibomacdev@gmail.com>
This commit is contained in:
Patrick Luby
2024-06-28 13:23:36 +02:00
committed by Patrick Luby
parent 2fd72ed9cb
commit 2e87c64424
1 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vcl/quartz/CoreTextFontFace.cxx
+28 -25
View File
@@ -46,43 +46,46 @@ sal_IntPtr CoreTextFontFace::GetFontId() const
const std::vector<hb_variation_t>& CoreTextFontFace::GetVariations(const LogicalFontInstance&) const
{
CTFontRef pFont = CTFontCreateWithFontDescriptor(mxFontDescriptor, 0.0, nullptr);
if (!mxVariations)
{
mxVariations.emplace();
CFArrayRef pAxes = CTFontCopyVariationAxes(pFont);
if (pAxes)
CTFontRef pFont = CTFontCreateWithFontDescriptor(mxFontDescriptor, 0.0, nullptr);
if (pFont)
{
CFDictionaryRef pVariations = CTFontCopyVariation(pFont);
if (pVariations)
CFArrayRef pAxes = CTFontCopyVariationAxes(pFont);
if (pAxes)
{
CFIndex nAxes = CFArrayGetCount(pAxes);
for (CFIndex i = 0; i < nAxes; ++i)
CFDictionaryRef pVariations = CTFontCopyVariation(pFont);
if (pVariations)
{
auto pAxis = static_cast<CFDictionaryRef>(CFArrayGetValueAtIndex(pAxes, i));
if (pAxis)
CFIndex nAxes = CFArrayGetCount(pAxes);
for (CFIndex i = 0; i < nAxes; ++i)
{
hb_tag_t nTag;
auto pTag = static_cast<CFNumberRef>(
CFDictionaryGetValue(pAxis, kCTFontVariationAxisIdentifierKey));
if (!pTag)
continue;
CFNumberGetValue(pTag, kCFNumberIntType, &nTag);
auto pAxis = static_cast<CFDictionaryRef>(CFArrayGetValueAtIndex(pAxes, i));
if (pAxis)
{
hb_tag_t nTag;
auto pTag = static_cast<CFNumberRef>(
CFDictionaryGetValue(pAxis, kCTFontVariationAxisIdentifierKey));
if (!pTag)
continue;
CFNumberGetValue(pTag, kCFNumberIntType, &nTag);
float fValue;
auto pValue
= static_cast<CFNumberRef>(CFDictionaryGetValue(pVariations, pTag));
if (!pValue)
continue;
CFNumberGetValue(pValue, kCFNumberFloatType, &fValue);
float fValue;
auto pValue
= static_cast<CFNumberRef>(CFDictionaryGetValue(pVariations, pTag));
if (!pValue)
continue;
CFNumberGetValue(pValue, kCFNumberFloatType, &fValue);
mxVariations->push_back({ nTag, fValue });
mxVariations->push_back({ nTag, fValue });
}
}
CFRelease(pVariations);
}
CFRelease(pVariations);
CFRelease(pAxes);
}
CFRelease(pAxes);
CFRelease(pFont);
}
}