slackware-current/source/x/fontconfig/patches/fontconfig-fix-SAST.patch
Patrick J Volkerding 6e6f0c6efb Thu Nov 28 00:18:02 UTC 2024
a/tcsh-6.24.14-x86_64-1.txz:  Upgraded.
ap/sudo-1.9.16p2-x86_64-1.txz:  Upgraded.
n/netatalk-4.0.7-x86_64-2.txz:  Rebuilt.
  Fixed config file handling. Thanks to marav.
n/openldap-2.6.9-x86_64-1.txz:  Upgraded.
t/texlive-2024.240409-x86_64-3.txz:  Rebuilt.
  Move files from /etc/fonts/conf.avail to /usr/share/fontconfig/fonts.avail.
x/dejavu-fonts-ttf-2.37-noarch-7.txz:  Rebuilt.
  Move files from /etc/fonts/conf.avail to /usr/share/fontconfig/fonts.avail.
x/font-bh-ttf-1.0.4-noarch-2.txz:  Rebuilt.
  Move files from /etc/fonts/conf.avail to /usr/share/fontconfig/fonts.avail.
x/fontconfig-2.15.0-x86_64-1.txz:  Upgraded.
  Thanks to Didier Spaier for the updated patches and meson build script!
x/liberation-fonts-ttf-2.1.5-noarch-2.txz:  Rebuilt.
  Move files from /etc/fonts/conf.avail to /usr/share/fontconfig/fonts.avail.
x/noto-cjk-fonts-ttf-2.001-noarch-4.txz:  Rebuilt.
  Move files from /etc/fonts/conf.avail to /usr/share/fontconfig/fonts.avail.
x/ttf-indic-fonts-0.5.14-noarch-6.txz:  Rebuilt.
  Move files from /etc/fonts/conf.avail to /usr/share/fontconfig/fonts.avail.
x/ttf-tlwg-0.7.3-noarch-2.txz:  Rebuilt.
  Move files from /etc/fonts/conf.avail to /usr/share/fontconfig/fonts.avail.
x/wqy-zenhei-font-ttf-0.8.38_1-noarch-10.txz:  Rebuilt.
  Move files from /etc/fonts/conf.avail to /usr/share/fontconfig/fonts.avail.
xap/xlockmore-5.81-x86_64-1.txz:  Upgraded.
testing/packages/mesa-24.3.0-x86_64-1.txz:  Added.
2024-11-28 02:04:23 +01:00

54 lines
1.3 KiB
Diff

From eaa335e7c4686c622f31e691f8a41fdf30ea42b3 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Wed, 31 Jul 2024 17:31:36 +0900
Subject: [PATCH 1/2] Fix a memory leak in _get_real_paths_from_prefix
---
src/fcxml.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/fcxml.c b/src/fcxml.c
index 9fe0674..083fc1f 100644
--- a/src/fcxml.c
+++ b/src/fcxml.c
@@ -1327,11 +1327,9 @@ _get_real_paths_from_prefix(FcConfigParse *parse, const FcChar8 *path, const FcC
if (!p)
return NULL;
parent = FcStrDirname (p);
+ FcStrFree (p);
if (!parent)
- {
- free (p);
return NULL;
- }
}
}
#ifndef _WIN32
--
2.45.2
From ab765827101787d49c0a66b23addc1f68f99a455 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Wed, 31 Jul 2024 17:37:53 +0900
Subject: [PATCH 2/2] Set FcTypeVoid if no valid types to convert
---
src/fcname.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/fcname.c b/src/fcname.c
index 566f0ef..b152bd9 100644
--- a/src/fcname.c
+++ b/src/fcname.c
@@ -406,6 +406,8 @@ FcNameConvert (FcType type, const char *object, FcChar8 *string)
v.u.r = FcRangeCreateDouble (b, e);
break;
default:
+ /* No valid type to convert */
+ v.type = FcTypeVoid;
break;
}
return v;
--
2.45.2