commit b0f047a710dd9bb69a12eeae24a116c74b42ce81
author Patrick Luby <guibmacdev@gmail.com> Thu Jun 27 20:05:19 2024 -0400
committer Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Sat Jun 29 22:35:57 2024 +0200
tree c5c751106477ff439868bdf94df98d09b4fa936f
parent 45ef851edabde8c974b4b7435e040a767b51ffb6

tdf#159680 fix memory leak of CTFontRef

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>
(cherry picked from commit 2e87c644245751aea9f50faf16c4ca4d57b0c2f1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169676
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>

vcl/quartz/CoreTextFontFace.cxx

diff --git a/vcl/quartz/CoreTextFontFace.cxx b/vcl/quartz/CoreTextFontFace.cxx
index 662b439..47792ff 100644
--- a/vcl/quartz/CoreTextFontFace.cxx
+++ b/vcl/quartz/CoreTextFontFace.cxx
@@ -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);
        }
    }