diff options
Diffstat (limited to 'gfx/cairo/fix-win32-font-assertion.patch')
| -rw-r--r-- | gfx/cairo/fix-win32-font-assertion.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/gfx/cairo/fix-win32-font-assertion.patch b/gfx/cairo/fix-win32-font-assertion.patch new file mode 100644 index 000000000..23cc5474b --- /dev/null +++ b/gfx/cairo/fix-win32-font-assertion.patch @@ -0,0 +1,27 @@ +From: Jonathan Kew <jkew@mozilla.com> +bug 838617 - don't assert equality with the key's hash unless it was actually initialized. r=roc + +diff --git a/gfx/cairo/cairo/src/cairo-win32-font.c b/gfx/cairo/cairo/src/cairo-win32-font.c +--- a/gfx/cairo/cairo/src/cairo-win32-font.c ++++ b/gfx/cairo/cairo/src/cairo-win32-font.c +@@ -2104,19 +2104,19 @@ cairo_win32_font_face_create_for_logfont + font_face = malloc (sizeof (cairo_win32_font_face_t)); + if (!font_face) { + _cairo_error_throw (CAIRO_STATUS_NO_MEMORY); + goto FAIL; + } + + _cairo_win32_font_face_init_key (font_face, logfont, font); + _cairo_font_face_init (&font_face->base, &_cairo_win32_font_face_backend); +- assert (font_face->base.hash_entry.hash == key.base.hash_entry.hash); + + if (!font) { ++ assert (font_face->base.hash_entry.hash == key.base.hash_entry.hash); + status = _cairo_hash_table_insert (hash_table, + &font_face->base.hash_entry); + if (unlikely (status)) + goto FAIL; + } + + DONE: + if (!font) { |