Module Name: xsrc
Committed By: christos
Date: Sun Jan 28 16:44:15 UTC 2018
Modified Files:
xsrc/external/mit/fontconfig/dist/src: fcmatch.c
Log Message:
CID-1428671: Unchecked malloc/strdup
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/fontconfig/dist/src/fcmatch.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/fontconfig/dist/src/fcmatch.c
diff -u xsrc/external/mit/fontconfig/dist/src/fcmatch.c:1.9 xsrc/external/mit/fontconfig/dist/src/fcmatch.c:1.10
--- xsrc/external/mit/fontconfig/dist/src/fcmatch.c:1.9 Wed Aug 30 16:11:59 2017
+++ xsrc/external/mit/fontconfig/dist/src/fcmatch.c Sun Jan 28 11:44:15 2018
@@ -703,6 +703,12 @@ FcFontSetMatchInternal (FcFontSet **se
FcBool f = FcTrue;
ss = s = strdup (env);
+ if (ss == NULL)
+ {
+ fprintf (stderr, "Fontconfig Error: %s\n",
+ strerror (errno));
+ exit (1);
+ }
os = FcObjectSetCreate ();
while (f)
{
@@ -719,6 +725,12 @@ FcFontSetMatchInternal (FcFontSet **se
len = (p - s) + 1;
}
x = malloc (sizeof (char) * len);
+ if (x == NULL)
+ {
+ fprintf (stderr, "Fontconfig Error: %s\n",
+ strerror (errno));
+ exit (1);
+ }
strncpy (x, s, len - 1);
x[len - 1] = 0;
if (FcObjectFromName (x) > 0)
