From cb86c13b626f098ce4e65072a375494993548ebe Mon Sep 17 00:00:00 2001 From: Jonathan Kew Date: Thu, 29 Apr 2021 08:52:31 +0000 Subject: [PATCH] Don't leave the shm field uninitialized when building without shm support. This can result in reading an uninitialized value in draw_image_boxes() in cairo-xlib-render-compositor.c. --- src/cairo-xlib-surface-shm.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/cairo-xlib-surface-shm.c b/src/cairo-xlib-surface-shm.c index ccdaf4cbc..10f947d9c 100644 --- a/src/cairo-xlib-surface-shm.c +++ b/src/cairo-xlib-surface-shm.c @@ -43,7 +43,10 @@ #include "cairo-xlib-surface-private.h" #if !HAVE_X11_EXTENSIONS_XSHM_H || !(HAVE_X11_EXTENSIONS_SHMPROTO_H || HAVE_X11_EXTENSIONS_SHMSTR_H) -void _cairo_xlib_display_init_shm (cairo_xlib_display_t *display) {} +void _cairo_xlib_display_init_shm (cairo_xlib_display_t *display) +{ + display->shm = NULL; +} cairo_surface_t * _cairo_xlib_surface_get_shm (cairo_xlib_surface_t *surface,