commit f3981a8bcd97a0388bf150ea7c1b4a1015e5e358
author Akira TAGOH <akira@tagoh.org> Thu Jul 19 16:44:03 2018 +0900
committer Akira TAGOH <akira@tagoh.org> Thu Jul 19 16:44:03 2018 +0900
tree 459858469e46522093225864ab84a9223234d7d9
parent 586ac3b6c0a324ae8545e2e6437f62e851daa203

Fix access in a null pointer dereference

src/fccfg.c

diff --git a/src/fccfg.c b/src/fccfg.c
index b61848a..31ed238 100644
--- a/src/fccfg.c
+++ b/src/fccfg.c
@@ -748,12 +748,12 @@
 	v.u.l = FcLangSetPromote (v.u.s, buf);
 	v.type = FcTypeLangSet;
     }
-    else if (v.type == FcTypeVoid && u.type == FcTypeLangSet)
+    else if (buf && v.type == FcTypeVoid && u.type == FcTypeLangSet)
     {
 	v.u.l = FcLangSetPromote (NULL, buf);
 	v.type = FcTypeLangSet;
     }
-    else if (v.type == FcTypeVoid && u.type == FcTypeCharSet)
+    else if (buf && v.type == FcTypeVoid && u.type == FcTypeCharSet)
     {
 	v.u.c = FcCharSetPromote (buf);
 	v.type = FcTypeCharSet;