diff options
| author | marha <marha@users.sourceforge.net> | 2014-07-04 19:50:15 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-07-04 19:50:15 +0200 |
| commit | fe03d6aef6338e43593f164b09ae993bcd0ecbdd (patch) | |
| tree | 0fdb7e12fc82894e07b8b8141f2dbb00a93c60ad /fontconfig/src/fccfg.c | |
| parent | cfc5bafcb2db8c6e05d7be6bb7315960be08c0d8 (diff) | |
| download | vcxsrv-fe03d6aef6338e43593f164b09ae993bcd0ecbdd.tar.gz vcxsrv-fe03d6aef6338e43593f164b09ae993bcd0ecbdd.tar.bz2 vcxsrv-fe03d6aef6338e43593f164b09ae993bcd0ecbdd.zip | |
fontconfig mesa pixman xserver git update 4 July 2014
xserver commit a61ca6f006d70343c88fe45206fae0669d1e8971
pixman commit 6d2cf40166d81bfc63108504c8022dc4fec37ff5
fontconfig commit 5b22776999b6052afe0e829b1a0c0935bbe1e9f7
mesa commit 9a37eb8adb6558a4abf47774b583cb582a0ae116
Diffstat (limited to 'fontconfig/src/fccfg.c')
| -rw-r--r-- | fontconfig/src/fccfg.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/fontconfig/src/fccfg.c b/fontconfig/src/fccfg.c index e2555f0ce..6d3259513 100644 --- a/fontconfig/src/fccfg.c +++ b/fontconfig/src/fccfg.c @@ -2342,7 +2342,7 @@ void FcConfigSetSysRoot (FcConfig *config, const FcChar8 *sysroot) { - FcChar8 *s; + FcChar8 *s = NULL; FcBool init = FcFalse; if (!config) @@ -2362,9 +2362,12 @@ FcConfigSetSysRoot (FcConfig *config, } } - s = FcStrCopyFilename (sysroot); - if (!s) - return; + if (sysroot) + { + s = FcStrCopyFilename (sysroot); + if (!s) + return; + } if (config->sysRoot) FcStrFree (config->sysRoot); |