From 22bab3cd7d0b2bcedfdd86f198d1ed9a21dd82aa Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Tue, 24 Jan 2012 18:33:14 +0000 Subject: [PATCH] sna: Handle malloc failures when downsampling Signed-off-by: Chris Wilson --- src/sna/sna_render.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/sna/sna_render.c b/src/sna/sna_render.c index 56d0014d..af817351 100644 --- a/src/sna/sna_render.c +++ b/src/sna/sna_render.c @@ -734,9 +734,19 @@ static int sna_render_picture_downsample(struct sna *sna, tmp_dst = CreatePicture(0, &tmp->drawable, format, 0, NULL, serverClient, &error); + if (!tmp_dst) { + screen->DestroyPixmap(tmp); + goto fixup; + } tmp_src = CreatePicture(0, &pixmap->drawable, format, 0, NULL, serverClient, &error); + if (!tmp_src) { + FreePicture(tmp_dst, 0); + screen->DestroyPixmap(tmp); + goto fixup; + } + tmp_src->repeat = true; tmp_src->repeatType = RepeatPad; tmp_src->filter = PictFilterBilinear;