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/fcxml.c | |
| 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/fcxml.c')
| -rwxr-xr-x | fontconfig/src/fcxml.c | 1 |
1 files changed, 1 insertions, 0 deletions
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) |