michael@0: From: Jonathan Kew <jkew@mozilla.com>
michael@0: bug 838617 - don't assert equality with the key's hash unless it was actually initialized. r=roc
michael@0: 
michael@0: diff --git a/gfx/cairo/cairo/src/cairo-win32-font.c b/gfx/cairo/cairo/src/cairo-win32-font.c
michael@0: --- a/gfx/cairo/cairo/src/cairo-win32-font.c
michael@0: +++ b/gfx/cairo/cairo/src/cairo-win32-font.c
michael@0: @@ -2104,19 +2104,19 @@ cairo_win32_font_face_create_for_logfont
michael@0:      font_face = malloc (sizeof (cairo_win32_font_face_t));
michael@0:      if (!font_face) {
michael@0:          _cairo_error_throw (CAIRO_STATUS_NO_MEMORY);
michael@0:  	goto FAIL;
michael@0:      }
michael@0:  
michael@0:      _cairo_win32_font_face_init_key (font_face, logfont, font);
michael@0:      _cairo_font_face_init (&font_face->base, &_cairo_win32_font_face_backend);
michael@0: -    assert (font_face->base.hash_entry.hash == key.base.hash_entry.hash);
michael@0:  
michael@0:      if (!font) {
michael@0: +        assert (font_face->base.hash_entry.hash == key.base.hash_entry.hash);
michael@0:          status = _cairo_hash_table_insert (hash_table,
michael@0:                                             &font_face->base.hash_entry);
michael@0:          if (unlikely (status))
michael@0:  	    goto FAIL;
michael@0:      }
michael@0:  
michael@0:  DONE:
michael@0:      if (!font) {