diff options
| author | Akira TAGOH <akira@tagoh.org> | 2022-09-28 21:39:09 +0900 |
|---|---|---|
| committer | Akira TAGOH <akira@tagoh.org> | 2022-09-28 21:39:09 +0900 |
| commit | fc0e9a78d2fe3b26f0b93c2a99b160e75e2a9f89 (patch) | |
| tree | 22b2dddb8a919bd5510fe7dd075c0e04ba587520 | |
| parent | 0924a35b6755baaaa4af7c9c2c6001c4ff7bea3d (diff) | |
| download | fontconfig-fc0e9a78d2fe3b26f0b93c2a99b160e75e2a9f89.tar.gz | |
Real fix of 91114d18c
The change in 91114d18c broke remapping font paths.
Patch from Mattias Clasen
Fixes https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/331
| -rw-r--r-- | src/fcstr.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/fcstr.c b/src/fcstr.c index 3fe518f..5ce65da 100644 --- a/src/fcstr.c +++ b/src/fcstr.c @@ -1467,7 +1467,6 @@ FcStrSetAddFilenamePairWithSalt (FcStrSet *set, const FcChar8 *a, const FcChar8 { FcChar8 *new_a = NULL; FcChar8 *new_b = NULL; - FcChar8 *rs = NULL; FcBool ret; if (a) @@ -1487,10 +1486,7 @@ FcStrSetAddFilenamePairWithSalt (FcStrSet *set, const FcChar8 *a, const FcChar8 } } /* Override maps with new one if exists */ - if (FcStrSetMemberAB (set, new_a, new_b, &rs)) - { - FcStrSetDel (set, rs); - } + FcStrSetDel (set, new_a); ret = FcStrSetAddTriple (set, new_a, new_b, salt); if (new_a) FcStrFree (new_a); |