diff options
| author | marha <marha@users.sourceforge.net> | 2013-01-17 09:25:28 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-01-17 09:25:28 +0100 |
| commit | 50c07563e17397daf040a32d8fdd3ab397e72371 (patch) | |
| tree | ae9c109e16ba86a498c43ab62830bca3641a78aa /fontconfig/src/fcfreetype.c | |
| parent | dc163f625ef006c8550791122bda28fb3eb67e3d (diff) | |
| parent | 4fc6b34d1c14cc61f553ca59264d0909656933f3 (diff) | |
| download | vcxsrv-50c07563e17397daf040a32d8fdd3ab397e72371.tar.gz vcxsrv-50c07563e17397daf040a32d8fdd3ab397e72371.tar.bz2 vcxsrv-50c07563e17397daf040a32d8fdd3ab397e72371.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig libxcb mesa xkbcomp git update 17 jan 2013
Diffstat (limited to 'fontconfig/src/fcfreetype.c')
| -rw-r--r-- | fontconfig/src/fcfreetype.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fontconfig/src/fcfreetype.c b/fontconfig/src/fcfreetype.c index e88c37770..cb502438f 100644 --- a/fontconfig/src/fcfreetype.c +++ b/fontconfig/src/fcfreetype.c @@ -1706,7 +1706,8 @@ FcFreeTypeQueryFace (const FT_Face face, { const char *font_format = FT_Get_X11_Font_Format (face); if (font_format) - FcPatternAddString (pat, FC_FONTFORMAT, (FcChar8 *) font_format); + if (!FcPatternAddString (pat, FC_FONTFORMAT, (FcChar8 *) font_format)) + goto bail2; } #endif |