From b1762935c3db2bc611750c61ce9cb38b9008db6b Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Thu, 19 Jul 2018 08:31:14 +0000 Subject: [PATCH] Fix possibly dereferencing a null pointer --- src/fcmatch.c | 13 ++++++++----- 1 file 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); }