diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-07 08:26:06 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-07 08:27:25 +0100 |
| commit | c97d11aec40d8fa07d6b456bf8694133a77d35f4 (patch) | |
| tree | 9e14e6f970a86af9f7107053c5c709e2e440d032 /fontconfig/src | |
| parent | 51c3a4e7b08aa904ff2af52a9f6f7adc748b361f (diff) | |
| parent | f7050e0ff2d1dd147ff5ef45f8ff7d8d7833db48 (diff) | |
| download | vcxsrv-c97d11aec40d8fa07d6b456bf8694133a77d35f4.tar.gz vcxsrv-c97d11aec40d8fa07d6b456bf8694133a77d35f4.tar.bz2 vcxsrv-c97d11aec40d8fa07d6b456bf8694133a77d35f4.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xextproto fontconfig libxcb mesa xserver git update 7 Nov 2013
Conflicts:
xorg-server/include/servermd.h
Diffstat (limited to 'fontconfig/src')
| -rw-r--r-- | fontconfig/src/fcname.c | 2 | ||||
| -rw-r--r-- | fontconfig/src/fcstr.c | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/fontconfig/src/fcname.c b/fontconfig/src/fcname.c index 712b2fad3..f302948dd 100644 --- a/fontconfig/src/fcname.c +++ b/fontconfig/src/fcname.c @@ -420,6 +420,8 @@ FcNameParse (const FcChar8 *name) if ((c = FcNameGetConstant (save))) { t = FcNameGetObjectType ((char *) c->object); + if (t == NULL) + goto bail2; switch ((int) t->type) { case FcTypeInteger: case FcTypeDouble: diff --git a/fontconfig/src/fcstr.c b/fontconfig/src/fcstr.c index 570717243..024dae325 100644 --- a/fontconfig/src/fcstr.c +++ b/fontconfig/src/fcstr.c @@ -924,12 +924,16 @@ FcStrBuildFilename (const FcChar8 *path, ...) { va_list ap; - FcStrSet *sset = FcStrSetCreate (); + FcStrSet *sset; FcStrList *list; FcChar8 *s, *ret = NULL, *p; size_t len = 0; - if (!sset || !path) + if (!path) + return NULL; + + sset = FcStrSetCreate (); + if (!sset) return NULL; if (!FcStrSetAdd (sset, path)) |