[PATCH weston] compositor-x11: fix segfault when use_pixman is true

Daniel Stone daniel at fooishbar.org
Thu Nov 24 11:46:49 UTC 2016


Hi Munakata-san,

On 24 November 2016 at 10:05, Ryo Munakata <ryomnktml at gmail.com> wrote:
> Signed-off-by: Ryo Munakata <ryomnktml at gmail.com>
> ---
>  libweston/compositor-x11.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/libweston/compositor-x11.c b/libweston/compositor-x11.c
> index de64e49..34ef854 100644
> --- a/libweston/compositor-x11.c
> +++ b/libweston/compositor-x11.c
> @@ -917,8 +917,9 @@ x11_output_enable(struct weston_output *base)
>                         weston_log("Failed to create pixman renderer for output\n");
>                         x11_output_deinit_shm(b, output);
>                         goto err;
> -               output->base.repaint = x11_output_repaint_shm;
>                 }
> +
> +               output->base.repaint = x11_output_repaint_shm;

Oh dear, I really should've caught this during review. Tested and
pushed, thankyou.

To ssh://git.freedesktop.org/git/wayland/weston
   9983400..e6dec90  upstream -> master

Cheers,
Daniel


More information about the wayland-devel mailing list