fontconfig: Branch 'main' - 2 commits

[GitLab Mirror]

 src/fccfg.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit af4dad4616a124182cb61635857fc27098b2fc13
Merge: e2dea58 bba8646
Author: Akira TAGOH <akira at tagoh.org>
Date:   Fri May 30 03:07:03 2025 +0000

    Merge branch 'fix-xdg-data-dirs' into 'main'
    
    Fix heap buffer underflow in FcConfigXdgDataDirs
    
    See merge request fontconfig/fontconfig!415

commit bba8646fdacc58d9d5ccb0e37527627b28a52e9b
Author: Thomas Anderson <thomasanderson at google.com>
Date:   Fri May 30 03:07:02 2025 +0000

    Fix heap buffer underflow in FcConfigXdgDataDirs
    
    See

diff --git a/src/fccfg.c b/src/fccfg.c
index d87a627..969eadf 100644
--- a/src/fccfg.c
+++ b/src/fccfg.c
@@ -2525,7 +2525,7 @@ FcConfigXdgDataDirs (void)
     const char *env = getenv ("XDG_DATA_DIRS");
     FcStrSet   *ret = FcStrSetCreate();
 
-    if (env) {
+    if (env && *env) {
 	FcChar8 *ee, *e = ee = FcStrCopy ((const FcChar8 *)env);
 
 	/* We don't intentionally use FC_SEARCH_PATH_SEPARATOR here because of: