frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glamor: Fixed one segfault bug when close screen. 

move the original glamor_fini to glamor_close_screen. And wrap the CloseScreen
with glamor_close_screen, Then we can do some thing before call the underlying
CloseScreen().
The root cause is that glamor_fini will be called after the ->CloseScreen().
This may trigger a segmentation fault at
glamor_unrealize_glyph_caches() at calling into FreePicture().
This commit is contained in:
Zhigang Gong 2011-04-13 15:50:26 +08:00
parent 0d9e8db8d0
commit 47b6531273
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
glamor/glamor.c
View File

@ -203,6 +203,9 @@ glamor_init(ScreenPtr screen)
goto fail; goto fail;
} }
glamor_priv->saved_close_screen = screen->CloseScreen;
screen->CloseScreen = glamor_close_screen;
glamor_priv->saved_create_gc = screen->CreateGC; glamor_priv->saved_create_gc = screen->CreateGC;
screen->CreateGC = glamor_create_gc; screen->CreateGC = glamor_create_gc;
@ -251,8 +254,8 @@ fail:
return FALSE; return FALSE;
} }
void Bool
glamor_fini(ScreenPtr screen) glamor_close_screen(int idx, ScreenPtr screen)
{ {
glamor_screen_private *glamor_priv = glamor_get_screen_private(screen); glamor_screen_private *glamor_priv = glamor_get_screen_private(screen);
#ifdef RENDER #ifdef RENDER
@ -260,7 +263,7 @@ glamor_fini(ScreenPtr screen)
#endif #endif
glamor_glyphs_fini(screen); glamor_glyphs_fini(screen);
screen->CloseScreen = glamor_priv->saved_close_screen;
screen->CreateGC = glamor_priv->saved_create_gc; screen->CreateGC = glamor_priv->saved_create_gc;
screen->CreatePixmap = glamor_priv->saved_create_pixmap; screen->CreatePixmap = glamor_priv->saved_create_pixmap;
screen->DestroyPixmap = glamor_priv->saved_destroy_pixmap; screen->DestroyPixmap = glamor_priv->saved_destroy_pixmap;
@ -275,4 +278,13 @@ glamor_fini(ScreenPtr screen)
ps->Glyphs = glamor_priv->saved_glyphs; ps->Glyphs = glamor_priv->saved_glyphs;
} }
#endif #endif
free(glamor_priv);
return screen->CloseScreen(idx, screen);
}
void
glamor_fini(ScreenPtr screen)
{
/* Do nothing currently. */
} }

4
glamor/glamor_priv.h
View File

@ -128,6 +128,7 @@ enum shader_in {
}; };
typedef struct glamor_screen_private { typedef struct glamor_screen_private {
CloseScreenProcPtr saved_close_screen;
CreateGCProcPtr saved_create_gc; CreateGCProcPtr saved_create_gc;
CreatePixmapProcPtr saved_create_pixmap; CreatePixmapProcPtr saved_create_pixmap;
DestroyPixmapProcPtr saved_destroy_pixmap; DestroyPixmapProcPtr saved_destroy_pixmap;
@ -282,6 +283,9 @@ t_from_x_coord_y(PixmapPtr pixmap, int y)
/* glamor.c */ /* glamor.c */
PixmapPtr glamor_get_drawable_pixmap(DrawablePtr drawable); PixmapPtr glamor_get_drawable_pixmap(DrawablePtr drawable);
Bool glamor_close_screen(int idx, ScreenPtr screen);
/* glamor_copyarea.c */ /* glamor_copyarea.c */
RegionPtr RegionPtr
glamor_copy_area(DrawablePtr src, DrawablePtr dst, GCPtr gc, glamor_copy_area(DrawablePtr src, DrawablePtr dst, GCPtr gc,