diff options
| author | marha <marha@users.sourceforge.net> | 2012-12-12 08:39:09 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-12-12 08:39:09 +0100 |
| commit | c648afe73ef43a15094508d2dd439e05738735bf (patch) | |
| tree | 6d69f2726eb57d22395ffbe0b7733eebc16d1bb1 /fontconfig/src | |
| parent | 853b3fc8ee9a4e7f26f87334655a3f5c772502b7 (diff) | |
| parent | b395c3c85251d4e8761704d8e3a3c9f9fa5b45cc (diff) | |
| download | vcxsrv-c648afe73ef43a15094508d2dd439e05738735bf.tar.gz vcxsrv-c648afe73ef43a15094508d2dd439e05738735bf.tar.bz2 vcxsrv-c648afe73ef43a15094508d2dd439e05738735bf.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa pixman xkeyboard-config git update 12 dev 2012
Diffstat (limited to 'fontconfig/src')
| -rw-r--r-- | fontconfig/src/fccfg.c | 2 | ||||
| -rw-r--r-- | fontconfig/src/fcstat.c | 5 | ||||
| -rw-r--r-- | fontconfig/src/fcstr.c | 2 | ||||
| -rwxr-xr-x | fontconfig/src/fcxml.c | 1 |
4 files changed, 7 insertions, 3 deletions
diff --git a/fontconfig/src/fccfg.c b/fontconfig/src/fccfg.c index 45b486945..f94f0e051 100644 --- a/fontconfig/src/fccfg.c +++ b/fontconfig/src/fccfg.c @@ -398,7 +398,7 @@ FcConfigSetCurrent (FcConfig *config) if (config == _fcConfig) return FcTrue; - if (!config->fonts) + if (!config->fonts[FcSetSystem]) if (!FcConfigBuildFonts (config)) return FcFalse; diff --git a/fontconfig/src/fcstat.c b/fontconfig/src/fcstat.c index d8663d036..d4431e00e 100644 --- a/fontconfig/src/fcstat.c +++ b/fontconfig/src/fcstat.c @@ -178,8 +178,9 @@ FcDirChecksum (const FcChar8 *dir, time_t *checksum) { struct Adler32 ctx; struct dirent **files; - int n, ret = 0; + int n; #ifndef HAVE_STRUCT_DIRENT_D_TYPE + int ret = 0; size_t len = strlen ((const char *)dir); #endif @@ -229,8 +230,10 @@ FcDirChecksum (const FcChar8 *dir, time_t *checksum) free (files[n]); } free (files); +#ifndef HAVE_STRUCT_DIRENT_D_TYPE if (ret == -1) return -1; +#endif *checksum = Adler32Finish (&ctx); diff --git a/fontconfig/src/fcstr.c b/fontconfig/src/fcstr.c index 99b59da0a..cc1465cc9 100644 --- a/fontconfig/src/fcstr.c +++ b/fontconfig/src/fcstr.c @@ -1193,7 +1193,7 @@ FcStrSetAddLangs (FcStrSet *strs, const char *languages) while ((next = strchr (p, ':'))) { len = next - p; - len = FC_MIN (len, 128); + len = FC_MIN (len, 127); strncpy ((char *) lang, p, len); lang[len] = 0; /* ignore an empty item */ diff --git a/fontconfig/src/fcxml.c b/fontconfig/src/fcxml.c index 0c8c80561..c840027d1 100755 --- a/fontconfig/src/fcxml.c +++ b/fontconfig/src/fcxml.c @@ -1862,6 +1862,7 @@ FcParseDir (FcConfigParse *parse) if (!data) { FcConfigMessage (parse, FcSevereError, "out of memory"); + data = prefix; goto bail; } if (prefix) |