Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 11:55:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 569510 - check validity of mScaledFont before passing to cairo APIs. r=jdaggett a=blocking2.0

Browse Source
This commit is contained in:
Jonathan Kew 2010-08-27 14:16:07 +01:00
parent fc83c442e9
commit 2ed70114b5
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gfx/thebes/gfxGDIFont.cpp
View File

@ -260,7 +260,8 @@ gfxGDIFont::SetupCairoFont(gfxContext *aContext)
if (!mMetrics) {
Initialize();
}
if (cairo_scaled_font_status(mScaledFont) != CAIRO_STATUS_SUCCESS) {
if (!mScaledFont ||
cairo_scaled_font_status(mScaledFont) != CAIRO_STATUS_SUCCESS) {
// Don't cairo_set_scaled_font as that would propagate the error to
// the cairo_t, precluding any further drawing.
return PR_FALSE;
@ -423,12 +424,13 @@ gfxGDIFont::Initialize()
&ctm, fontOptions);
cairo_font_options_destroy(fontOptions);
cairo_status_t cairoerr = cairo_scaled_font_status(mScaledFont);
if (cairoerr != CAIRO_STATUS_SUCCESS) {
if (!mScaledFont ||
cairo_scaled_font_status(mScaledFont) != CAIRO_STATUS_SUCCESS) {
#ifdef DEBUG
char warnBuf[1024];
sprintf(warnBuf, "Failed to create scaled font: %s status: %d",
NS_ConvertUTF16toUTF8(mFontEntry->Name()).get(), cairoerr);
NS_ConvertUTF16toUTF8(mFontEntry->Name()).get(),
mScaledFont ? cairo_scaled_font_status(mScaledFont) : 0);
NS_WARNING(warnBuf);
#endif
}