summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleg Oshmyan <chortos@inbox.lv>2017-02-11 14:02:32 +0200
committerOleg Oshmyan <chortos@inbox.lv>2017-02-11 14:13:09 +0200
commit7010ff3fb1916a4bdef3ce0f27f21a53095d9a5a (patch)
tree6fa9c9c66bb83e687a69be6c489fe18a64abb1b5
parentd83c4bc219bb9358f0ad919aa8837b95d948922e (diff)
downloadlibass-7010ff3fb1916a4bdef3ce0f27f21a53095d9a5a.tar.bz2
libass-7010ff3fb1916a4bdef3ce0f27f21a53095d9a5a.tar.xz
Explicitly handle FcPatternGetString(FC_POSTSCRIPT_NAME) mismatch
This does not affect functionality in any way, but it hopefully makes the logic easier to follow. Resolves CID 175691.
-rw-r--r--libass/ass_fontconfig.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/libass/ass_fontconfig.c b/libass/ass_fontconfig.c
index 304598e..552931f 100644
--- a/libass/ass_fontconfig.c
+++ b/libass/ass_fontconfig.c
@@ -148,9 +148,10 @@ static void scan_fonts(FcConfig *config, ASS_FontProvider *provider)
meta.fullnames = fullnames;
// read PostScript name
- meta.postscript_name = NULL;
- FcPatternGetString(pat, FC_POSTSCRIPT_NAME, 0,
- (FcChar8 **)&meta.postscript_name);
+ result = FcPatternGetString(pat, FC_POSTSCRIPT_NAME, 0,
+ (FcChar8 **)&meta.postscript_name);
+ if (result != FcResultMatch)
+ meta.postscript_name = NULL;
ass_font_provider_add_font(provider, &meta, path, index, (void *)pat);
}