diff options
| author | Michel Dänzer <daenzer@vmware.com> | 2009-10-01 16:45:11 +0200 |
|---|---|---|
| committer | Michel Dänzer <daenzer@vmware.com> | 2009-10-01 16:45:11 +0200 |
| commit | e32a341be66391e0ea1cc6ce19bbd57997f46b6b (patch) | |
| tree | 2fcf6429af6314422d220afff0786cbd8a871449 /src | |
| parent | 0b466c8705c9000c347760b5daafdf31c291736d (diff) | |
st/xorg: Check that ms->api->destroy is not NULL before calling it.
Fixes potential crash on X server shutdown.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/state_trackers/xorg/xorg_driver.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gallium/state_trackers/xorg/xorg_driver.c b/src/gallium/state_trackers/xorg/xorg_driver.c index 8c4cba035a..4bc87aa613 100644 --- a/src/gallium/state_trackers/xorg/xorg_driver.c +++ b/src/gallium/state_trackers/xorg/xorg_driver.c @@ -726,8 +726,10 @@ CloseScreen(int scrnIndex, ScreenPtr pScreen) if (ms->exa) xorg_exa_close(pScrn); + if (ms->api->destroy) ms->api->destroy(ms->api); - ms->api = NULL; + ms->api = NULL; + drmClose(ms->fd); ms->fd = -1; |