xserver: Branch 'master'

[Adam Jackson]

 randr/rrproperty.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit b0d371ab0a6efd4956c3677faa20b2ac15c33765
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Dec 1 11:36:06 2008 -0500

    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

diff --git a/randr/rrproperty.c b/randr/rrproperty.c
index decf6cb..b2d4146 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);
 }
 
 _X_EXPORT void