summaryrefslogtreecommitdiffstats
path: root/libass/ass_fontselect.c
diff options
context:
space:
mode:
authorGrigori Goronzy <greg@chown.ath.cx>2015-09-08 01:38:44 +0200
committerGrigori Goronzy <greg@chown.ath.cx>2015-09-08 01:38:44 +0200
commit8d57c52f2cc62fc31588eb3f9c5fbedd5e4de674 (patch)
tree7255633a21f311f03bf886420b335f50a941a8aa /libass/ass_fontselect.c
parent92c3ae13183bc5143c935006695c7ee26b8148bc (diff)
downloadlibass-8d57c52f2cc62fc31588eb3f9c5fbedd5e4de674.tar.bz2
libass-8d57c52f2cc62fc31588eb3f9c5fbedd5e4de674.tar.xz
fontselect: handle additional malloc errors
Diffstat (limited to 'libass/ass_fontselect.c')
-rw-r--r--libass/ass_fontselect.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/libass/ass_fontselect.c b/libass/ass_fontselect.c
index 2a00c37..7c02373 100644
--- a/libass/ass_fontselect.c
+++ b/libass/ass_fontselect.c
@@ -1051,9 +1051,12 @@ void ass_map_font(const ASS_FontMapping *map, int len, const char *name,
{
for (int i = 0; i < len; i++) {
if (strcasecmp(map[i].from, name) == 0) {
- meta->n_fullname = 1;
meta->fullnames = calloc(1, sizeof(char *));
- meta->fullnames[0] = strdup(map[i].to);
+ if (meta->fullnames) {
+ meta->fullnames[0] = strdup(map[i].to);
+ if (meta->fullnames[0])
+ meta->n_fullname = 1;
+ }
return;
}
}