diff --git a/NEWS.markdown b/NEWS.markdown index 8a20e4ac0104..12cc0e8f9df3 100644 --- a/NEWS.markdown +++ b/NEWS.markdown @@ -58,6 +58,7 @@ Windows users, please make sure to install [Microsoft .NET Desktop Runtime versi - AMF 1.4.33 (AMD VCN video encoding) - FFmpeg 7.0 (decoding and filters) - HarfBuzz 8.4.0 (subtitles) + - libass 0.17.2 (subtitles) - libdav1d 1.4.1 (AV1 video decoding) - libdovi 3.3.0 (Dolby Vision dynamic metadata) - libopus 1.5.2 (Opus audio encoding) diff --git a/contrib/libass/A01-font-info-leaks-fix.patch b/contrib/libass/A01-font-info-leaks-fix.patch deleted file mode 100644 index ad973b198103..000000000000 --- a/contrib/libass/A01-font-info-leaks-fix.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 91422bdb9497e8484b3248f5ae7eb50d41e2555d Mon Sep 17 00:00:00 2001 -From: Oleg Oshmyan -Date: Fri, 28 Jul 2023 00:59:59 +0300 -Subject: [PATCH] Plug a memory leak when adding a font on some platforms - -On macOS (with Core Text) and some versions of Windows (with DirectWrite) -(specifically, Windows 10+ Win32 as well as all versions of WinRT/UWP), -we read font metadata on our own via FreeType, filling implicit_meta in -ass_font_provider_add_font. However, we forgot to free it upon successful -font registration, leaking the memory allocated for the font name strings. - -The list of affected platforms would likely have expanded in the future, -as we eventually intend to read font names on our own across the board. - -Leak introduced in commit 887e6cc50bfbe8fc354993682edc03c51203e2fc. - -As a quick fix, add the corresponding frees on the successful path. -Ideally, we should refactor this function to avoid copying any freshly -allocated memory to begin with (and thus to avoid the need to free it). - -Fixes: https://github.com/libass/libass/issues/699 ---- - libass/ass_fontselect.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/libass/ass_fontselect.c b/libass/ass_fontselect.c -index df073366c..6d588ce0b 100644 ---- a/libass/ass_fontselect.c -+++ b/libass/ass_fontselect.c -@@ -534,6 +534,10 @@ ass_font_provider_add_font(ASS_FontProvider *provider, - info->provider = provider; - - selector->n_font++; -+ -+ free_font_info(&implicit_meta); -+ free(implicit_meta.postscript_name); -+ - return true; - - error: diff --git a/contrib/libass/module.defs b/contrib/libass/module.defs index ac57f3d75861..bc0fbaf62559 100644 --- a/contrib/libass/module.defs +++ b/contrib/libass/module.defs @@ -7,9 +7,9 @@ endif $(eval $(call import.MODULE.defs,LIBASS,libass,$(__deps__))) $(eval $(call import.CONTRIB.defs,LIBASS)) -LIBASS.FETCH.url = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/libass-0.17.1.tar.gz -LIBASS.FETCH.url += https://github.com/libass/libass/releases/download/0.17.1/libass-0.17.1.tar.gz -LIBASS.FETCH.sha256 = d653be97198a0543c69111122173c41a99e0b91426f9e17f06a858982c2fb03d +LIBASS.FETCH.url = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs2/libass-0.17.2.tar.gz +LIBASS.FETCH.url += https://github.com/libass/libass/releases/download/0.17.2/libass-0.17.2.tar.gz +LIBASS.FETCH.sha256 = a9afb52bf76a2569263fe2038896774c991b35c0968342a03be708e56ea60c3b LIBASS.GCC.args.c_std =