Index: gfx/cairo/cairo/src/cairo-xlib-surface.c
===================================================================
RCS file: /cvsroot/mozilla/gfx/cairo/cairo/src/cairo-xlib-surface.c,v
retrieving revision 1.11
diff -u -8 -p -r1.11 cairo-xlib-surface.c
--- gfx/cairo/cairo/src/cairo-xlib-surface.c	28 Mar 2006 02:29:07 -0000	1.11
+++ gfx/cairo/cairo/src/cairo-xlib-surface.c	17 May 2006 19:55:55 -0000
@@ -2156,17 +2156,18 @@ _cairo_xlib_surface_scaled_font_fini (ca
 }
 
 static void
 _cairo_xlib_surface_scaled_glyph_fini (cairo_scaled_glyph_t *scaled_glyph,
 				       cairo_scaled_font_t  *scaled_font)
 {
     cairo_xlib_surface_font_private_t	*font_private = scaled_font->surface_private;
 
-    if (font_private != NULL && scaled_glyph->surface_private != NULL) {
+    if (font_private != NULL && scaled_glyph->surface_private != NULL &&
+        scaled_glyph->surface_private != (void *) 1) {
 	unsigned long	glyph_index = _cairo_scaled_glyph_index(scaled_glyph);
 	XRenderFreeGlyphs (font_private->dpy,
 			   font_private->glyphset,
 			   &glyph_index, 1);
     }
 }
 
 static cairo_bool_t