summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2008-12-01 11:36:06 -0500
committerKeith Packard <keithp@keithp.com>2008-12-02 23:38:33 -0800
commitf5ef57e5fef0be80d660c26ed370f608b4444a5e (patch)
tree5c476c18c4d42f6e7798db5c8c752773774e613a
parent40116cd5d0c205f4e8ab340dca80e38f8b78dddb (diff)
randr: Don't send output property events on server exit
If the Window resource type is already gone, there's no point in trying to send events, all it can do is access already-freed memory. Relevant thread: http://lists.freedesktop.org/archives/xorg/2008-November/040443.html (cherry picked from commit b0d371ab0a6efd4956c3677faa20b2ac15c33765) Signed-off-by: Keith Packard <keithp@keithp.com>
-rw-r--r--randr/rrproperty.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/randr/rrproperty.c b/randr/rrproperty.c
index 6ca7cc900..12923a2c7 100644
--- a/randr/rrproperty.c
+++ b/randr/rrproperty.c
@@ -59,7 +59,8 @@ DeliverPropertyEvent(WindowPtr pWin, void *value)
static void RRDeliverPropertyEvent(ScreenPtr pScreen, xEvent *event)
{
- WalkTree(pScreen, DeliverPropertyEvent, event);
+ if (!(dispatchException & (DE_RESET | DE_TERMINATE)))
+ WalkTree(pScreen, DeliverPropertyEvent, event);
}
void