diff options
| author | marha <marha@users.sourceforge.net> | 2012-06-12 08:30:03 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-06-12 08:30:03 +0200 |
| commit | 925b68a7b26823fdfa1cb25d3edc3545fc2175b1 (patch) | |
| tree | 57c1e15fcc492bdc9b9cfd195e552c69aba845ce /fontconfig/src/fcxml.c | |
| parent | 567cbd4acc1e35ae40d99b24bb321d97632399db (diff) | |
| download | vcxsrv-925b68a7b26823fdfa1cb25d3edc3545fc2175b1.tar.gz vcxsrv-925b68a7b26823fdfa1cb25d3edc3545fc2175b1.tar.bz2 vcxsrv-925b68a7b26823fdfa1cb25d3edc3545fc2175b1.zip | |
fontconfig mesa pixman git update 12 Juni 2012
Diffstat (limited to 'fontconfig/src/fcxml.c')
| -rw-r--r-- | fontconfig/src/fcxml.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fontconfig/src/fcxml.c b/fontconfig/src/fcxml.c index 5201b3c04..d70f70b70 100644 --- a/fontconfig/src/fcxml.c +++ b/fontconfig/src/fcxml.c @@ -1850,6 +1850,9 @@ FcParseDir (FcConfigParse *parse) { const FcChar8 *attr, *data; FcChar8 *prefix = NULL; +#ifdef _WIN32 + FcChar8 buffer[1000]; +#endif attr = FcConfigGetAttribute (parse, "prefix"); if (attr && FcStrCmp (attr, (const FcChar8 *)"xdg") == 0) @@ -1886,7 +1889,7 @@ FcParseDir (FcConfigParse *parse) if (!GetModuleFileName (NULL, buffer, sizeof (buffer) - 20)) { FcConfigMessage (parse, FcSevereError, "GetModuleFileName failed"); - break; + goto bail; } /* * Must use the multi-byte aware function to search @@ -1905,7 +1908,7 @@ FcParseDir (FcConfigParse *parse) if (!GetModuleFileName (NULL, buffer, sizeof (buffer) - 20)) { FcConfigMessage (parse, FcSevereError, "GetModuleFileName failed"); - break; + goto bail; } p = _mbsrchr (data, '\\'); if (p) *p = '\0'; @@ -1919,7 +1922,7 @@ FcParseDir (FcConfigParse *parse) if (rc == 0 || rc > sizeof (buffer) - 20) { FcConfigMessage (parse, FcSevereError, "GetSystemWindowsDirectory failed"); - break; + goto bail; } if (data [strlen (data) - 1] != '\\') strcat (data, "\\"); @@ -2510,9 +2513,6 @@ FcEndElement(void *userData, const XML_Char *name) { FcConfigParse *parse = userData; FcChar8 *data; -#ifdef _WIN32 - FcChar8 buffer[1000]; -#endif if (!parse->pstack) return; |