From 29fcc15efabb5b1f7e1e0211da9714cf9e3cbd1c Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Mon, 11 Nov 2013 11:44:17 +0000 Subject: [PATCH] sna: Assert that gc->funcs is never set to NULL References: https://bugs.freedesktop.org/show_bug.cgi?id=71415 Signed-off-by: Chris Wilson --- src/sna/sna_accel.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c index 9cff1de..983a5f3 100644 --- a/src/sna/sna_accel.c +++ b/src/sna/sna_accel.c @@ -3948,6 +3948,7 @@ static bool must_check sna_gc_move_to_cpu(GCPtr gc, assert(gc->ops == (GCOps *)&sna_gc_ops); gc->ops = (GCOps *)&sna_gc_ops__cpu; + assert(gc->funcs); sgc->old_funcs = gc->funcs; gc->funcs = (GCFuncs *)&sna_gc_funcs__cpu; @@ -4010,6 +4011,7 @@ static void sna_gc_move_to_gpu(GCPtr gc) gc->ops = (GCOps *)&sna_gc_ops; gc->funcs = sna_gc(gc)->old_funcs; + assert(gc->funcs); gc->pCompositeClip = sna_gc(gc)->priv; assert(gc->pCompositeClip); } -- 2.7.4