diff options
| author | Akira TAGOH <akira@tagoh.org> | 2018-07-19 08:31:14 +0000 |
|---|---|---|
| committer | Akira TAGOH <akira@tagoh.org> | 2018-07-19 08:31:14 +0000 |
| commit | b1762935c3db2bc611750c61ce9cb38b9008db6b (patch) | |
| tree | 48d562f38d281948182e604ed5ba9f8e005ab9f3 /src/fcmatch.c | |
| parent | 8e97d745cc21cd2e1459840a63ed13595fcf2acd (diff) | |
| download | fontconfig-b1762935c3db2bc611750c61ce9cb38b9008db6b.tar.gz | |
Fix possibly dereferencing a null pointer
Diffstat (limited to 'src/fcmatch.c')
| -rw-r--r-- | src/fcmatch.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/fcmatch.c b/src/fcmatch.c index cab38ca..c3d2b8a 100644 --- a/src/fcmatch.c +++ b/src/fcmatch.c @@ -814,11 +814,14 @@ FcFontSetMatchInternal (FcFontSet **sets, len = (p - s); } x = malloc (sizeof (char) * (len + 1)); - strcpy (x, s); - if (FcObjectFromName (x) > 0) - FcObjectSetAdd (os, x); - s = p + 1; - free (x); + if (x) + { + strcpy (x, s); + if (FcObjectFromName (x) > 0) + FcObjectSetAdd (os, x); + s = p + 1; + free (x); + } } free (ss); } |