OSDN Git Service
(root)
/
android-x86
/
external-mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0b466c8
)
st/xorg: Check that ms->api->destroy is not NULL before calling it.
author
Michel Dänzer
<daenzer@vmware.com>
Thu, 1 Oct 2009 14:45:11 +0000
(16:45 +0200)
committer
Michel Dänzer
<daenzer@vmware.com>
Thu, 1 Oct 2009 14:45:11 +0000
(16:45 +0200)
Fixes potential crash on X server shutdown.
src/gallium/state_trackers/xorg/xorg_driver.c
patch
|
blob
|
history
diff --git
a/src/gallium/state_trackers/xorg/xorg_driver.c
b/src/gallium/state_trackers/xorg/xorg_driver.c
index
8c4cba0
..
4bc87aa
100644
(file)
--- 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;