walkero
/
fontconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Check instance-index before accessing array 

Ouch!
This commit is contained in:
Behdad Esfahbod 2017-09-13 02:26:25 -04:00
parent b6440cbd7f
commit 66f082451d
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/fcfreetype.c
View File

@ -1238,8 +1238,9 @@ FcFreeTypeQueryFace (const FT_Face face,
if (id >> 16) if (id >> 16)
{ {
if (!FT_Get_MM_Var (face, &master)) unsigned int instance_id = (id >> 16) - 1;
instance = &master->namedstyle[(id >> 16) - 1]; if (!FT_Get_MM_Var (face, &master) && instance_id < master->num_namedstyles)
instance = &master->namedstyle[instance_id];
if (instance) if (instance)
{ {
@ -1266,6 +1267,8 @@ FcFreeTypeQueryFace (const FT_Face face,
} }
} }
} }
else
goto bail1;
} }
/* /*