From d4164de5ccb82068e2858a90b2cd44eef82b6037 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Fri, 1 Mar 2013 12:13:47 +0000 Subject: [PATCH] sna: Assert that the ScrnInfo and ScreenPtr relationship is correct References: https://bugs.freedesktop.org/show_bug.cgi?id=56608 Signed-off-by: Chris Wilson --- src/sna/sna_driver.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c index 1cee1fb4..2250e925 100644 --- a/src/sna/sna_driver.c +++ b/src/sna/sna_driver.c @@ -230,6 +230,9 @@ static Bool sna_create_screen_resources(ScreenPtr screen) DBG(("%s(%dx%d@%d)\n", __FUNCTION__, screen->width, screen->height, screen->rootDepth)); + assert(sna->scrn == xf86ScreenToScrn(screen)); + assert(sna->scrn->pScreen == screen); + free(screen->devPrivate); screen->devPrivate = NULL; @@ -916,6 +919,9 @@ sna_screen_init(SCREEN_INIT_ARGS_DECL) DBG(("%s\n", __FUNCTION__)); + assert(sna->scrn == scrn); + assert(scrn->pScreen == NULL); /* set afterwards */ + if (!sna_register_all_privates()) return FALSE;