fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2025-12-25 04:50:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

[xlib] Disable XRender support if the surface has no xrender_format

Browse source 
Bug 11734:
  XRender crashes due to NULL pointer from Cairo on SGI O2
  (https://bugs.freedesktop.org/show_bug.cgi?id=1173)
is an example of a case where we try to perform an XRender operation on a
surface with a format that was not supported by the XRender extension. By
marking the extension version as -1 on those surfaces, the current checks
for SURFACE_RENDER_HAS_* always correctly return false and prevent us try
to create a Picture with a NULL xrender_format.
This commit is contained in:
Chris Wilson 2008-10-10 14:00:32 +01:00
parent 8ac8e8c523
commit ac3e4b4bea
1 changed files with 24 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/cairo-xlib-surface.c
View file

@ -1561,17 +1561,17 @@ _recategorize_composite_operation (cairo_xlib_surface_t *dst,
_cairo_matrix_is_integer_translation (&src_attr->matrix, NULL, NULL);
cairo_bool_t needs_alpha_composite;
if (!_cairo_surface_is_xlib (&src->base))
if (! _cairo_surface_is_xlib (&src->base))
return DO_UNSUPPORTED;
needs_alpha_composite =
_operator_needs_alpha_composite (op, _surface_has_alpha (src));
if (!have_mask &&
if (! have_mask &&
is_integer_translation &&
src_attr->extend == CAIRO_EXTEND_NONE &&
!needs_alpha_composite &&
_surfaces_compatible(src, dst))
! needs_alpha_composite &&
_surfaces_compatible (src, dst))
{
return DO_XCOPYAREA;
}
@ -1581,8 +1581,8 @@ _recategorize_composite_operation (cairo_xlib_surface_t *dst,
src_attr->extend == CAIRO_EXTEND_REPEAT &&
(src->width != 1 || src->height != 1))
{
if (!have_mask &&
!needs_alpha_composite &&
if (! have_mask &&
! needs_alpha_composite &&
_surfaces_compatible (dst, src))
{
return DO_XTILE;
@ -1591,10 +1591,10 @@ _recategorize_composite_operation (cairo_xlib_surface_t *dst,
return DO_UNSUPPORTED;
}
if (!CAIRO_SURFACE_RENDER_HAS_COMPOSITE (src))
if (! CAIRO_SURFACE_RENDER_HAS_COMPOSITE (src))
return DO_UNSUPPORTED;
if (!CAIRO_SURFACE_RENDER_HAS_COMPOSITE (dst))
if (! CAIRO_SURFACE_RENDER_HAS_COMPOSITE (dst))
return DO_UNSUPPORTED;
return DO_RENDER;
@ -1686,7 +1686,10 @@ _cairo_xlib_surface_composite (cairo_operator_t op,
status = CAIRO_INT_STATUS_UNSUPPORTED;
goto BAIL;
}
if (mask != NULL && !_cairo_surface_is_xlib (&mask->base)) {
if (mask != NULL &&
(! _cairo_surface_is_xlib (&mask->base) ||
! CAIRO_SURFACE_RENDER_HAS_COMPOSITE (dst)))
{
status = CAIRO_INT_STATUS_UNSUPPORTED;
goto BAIL;
}
@ -1872,7 +1875,7 @@ _cairo_xlib_surface_fill_rectangles (void *abstract_surface,
_cairo_xlib_display_notify (surface->screen_info->display);
if (!CAIRO_SURFACE_RENDER_HAS_FILL_RECTANGLES (surface)) {
if (! CAIRO_SURFACE_RENDER_HAS_FILL_RECTANGLES (surface)) {
if (op == CAIRO_OPERATOR_CLEAR ||
((op == CAIRO_OPERATOR_SOURCE || op == CAIRO_OPERATOR_OVER) &&
CAIRO_COLOR_IS_OPAQUE (color)))
@ -2055,7 +2058,8 @@ _cairo_xlib_surface_composite_trapezoids (cairo_operator_t op,
if (status)
return status;
operation = _recategorize_composite_operation (dst, op, src, &attributes, TRUE);
operation = _recategorize_composite_operation (dst, op, src,
&attributes, TRUE);
if (operation == DO_UNSUPPORTED) {
status = CAIRO_INT_STATUS_UNSUPPORTED;
goto BAIL;
@ -2505,6 +2509,12 @@ _cairo_xlib_surface_create_internal (Display *dpy,
xrender_format = NULL;
}
/* we cannot use XRender for this surface, so ensure we don't try */
if (xrender_format == NULL) {
surface->render_major = -1;
surface->render_minor = -1;
}
_cairo_surface_init (&surface->base, &cairo_xlib_surface_backend,
_xrender_format_to_content (xrender_format));
@ -3876,7 +3886,7 @@ _cairo_xlib_surface_show_glyphs (void *abstract_dst,
cairo_solid_pattern_t solid_pattern;
if (!CAIRO_SURFACE_RENDER_HAS_COMPOSITE_TEXT (dst) || !dst->xrender_format)
if (! CAIRO_SURFACE_RENDER_HAS_COMPOSITE_TEXT (dst))
return CAIRO_INT_STATUS_UNSUPPORTED;
/* Just let unbounded operators go through the fallback code
@ -3962,7 +3972,8 @@ _cairo_xlib_surface_show_glyphs (void *abstract_dst,
goto BAIL0;
}
operation = _recategorize_composite_operation (dst, op, src, &attributes, TRUE);
operation = _recategorize_composite_operation (dst, op, src,
&attributes, TRUE);
if (operation == DO_UNSUPPORTED) {
status = CAIRO_INT_STATUS_UNSUPPORTED;
goto BAIL1;