From c1845e9828de4bbc33e602c577b02f42d5460b28 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Jaakko=20Ker=C3=A4nen?= jaakko.keranen@iki.fi

Date: Sat, 30 Oct 2021 13:24:11 +0300

Subject: [PATCH 1/1] Windows: Fixed path handling issues during font loading

lib/the_Foundation | 2 +-

src/fontpack.c | 5 ++++-

2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/the_Foundation b/lib/the_Foundation

index adf8b403..6c7d2a3b 160000

--- a/lib/the_Foundation

+++ b/lib/the_Foundation

@@ -1 +1 @@

-Subproject commit adf8b403f3acecc159511c22a79b10e65453c088

+Subproject commit 6c7d2a3b050aae3b37adc626aa75f040b5acb930

diff --git a/src/fontpack.c b/src/fontpack.c

index ec62702f..40e4c96c 100644

--- a/src/fontpack.c

+++ b/src/fontpack.c

@@ -389,6 +389,7 @@ void handleIniKeyValue_FontPack_(void *context, const iString *table, const iStr

                 }

             }

             iString *fontFileId = concat_Path(d->loadPath, cleanPath);

•            iAssert(!isEmpty_String(fontFileId));
  

             /* FontFiles share source data blocks. The entire FontFiles can be reused, too, 

                if have the same collection index is in use. */

             iBlock *data = NULL;

@@ -466,6 +467,7 @@ iBool loadArchive_FontPack(iFontPack *d, const iArchive *zip) {

}

void setLoadPath_FontPack(iFontPack *d, const iString *path) {

• /* Note: path is for the local file system. */

 if (!d->loadPath) {

     d->loadPath = new_String();

 }

@@ -480,7 +482,8 @@ const iString *idFromUrl_FontPack(const iString *url) {

 iString *id = new_String();

 iUrl parts;

 init_Url(&parts, url);

• setRange_String(id, baseName_Path(collectNewRange_String(parts.path)));

• /* URLs always use slash as separator. */

• setRange_String(id, baseNameSep_Path(collectNewRange_String(parts.path), "/"));

 setRange_String(id, withoutExtension_Path(id));

 replace_String(id, " ", "-");

 return collect_String(id);

--

2.25.1