diff options
| author | marha <marha@users.sourceforge.net> | 2014-07-04 19:52:56 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-07-04 19:52:56 +0200 |
| commit | 62ed212e1add98e39c0f7a6e5a8a5726d66f161e (patch) | |
| tree | a80c4bf566c76665b3449f13fac7de72c66aa80a /fontconfig/src/fccfg.c | |
| parent | 3095a03ec3cb1f05b49362327d10a767299d7635 (diff) | |
| parent | fe03d6aef6338e43593f164b09ae993bcd0ecbdd (diff) | |
| download | vcxsrv-62ed212e1add98e39c0f7a6e5a8a5726d66f161e.tar.gz vcxsrv-62ed212e1add98e39c0f7a6e5a8a5726d66f161e.tar.bz2 vcxsrv-62ed212e1add98e39c0f7a6e5a8a5726d66f161e.zip | |
Merge remote-tracking branch 'origin/released'
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); |