提交 53539f99 编写于 作者: P prr

6764543: SIGSEGV in libfontconfig.so starting from jdk7b33

Reviewed-by: campbell, igor
上级 41200efb
......@@ -1233,7 +1233,7 @@ Java_sun_font_FontManager_getFontConfig
for (j=0; j<nfonts; j++) {
FcPattern *fontPattern = fontset->fonts[j];
FcChar8 *fontformat;
FcCharSet *unionCharset, *charset;
FcCharSet *unionCharset = NULL, *charset;
fontformat = NULL;
(*FcPatternGetString)(fontPattern, FC_FONTFORMAT, 0, &fontformat);
......@@ -1256,7 +1256,7 @@ Java_sun_font_FontManager_getFontConfig
if (nfonts==10) {
minGlyphs = 50;
}
if (j == 0) {
if (unionCharset == NULL) {
unionCharset = charset;
} else {
if ((*FcCharSetSubtractCount)(charset, unionCharset)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册