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

Fix possibly dereferencing a null pointer

This commit is contained in:
Akira TAGOH 2018-07-19 08:31:14 +00:00
parent 8e97d745cc
commit b1762935c3
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/fcmatch.c
View File

@ -814,12 +814,15 @@ FcFontSetMatchInternal (FcFontSet **sets,
len = (p - s); len = (p - s);
} }
x = malloc (sizeof (char) * (len + 1)); x = malloc (sizeof (char) * (len + 1));
if (x)
{
strcpy (x, s); strcpy (x, s);
if (FcObjectFromName (x) > 0) if (FcObjectFromName (x) > 0)
FcObjectSetAdd (os, x); FcObjectSetAdd (os, x);
s = p + 1; s = p + 1;
free (x); free (x);
} }
}
free (ss); free (ss);
} }
FcPatternPrint2 (p, best, os); FcPatternPrint2 (p, best, os);