xserver: Branch 'xorg-server-1.4-apple' - 2 commits
Jeremy Huddleston
jeremyhu at kemper.freedesktop.org
Wed Aug 12 10:29:10 PDT 2009
configure.ac | 2 +-
dix/window.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit d1f9aa40cdfe684b524604fd8776463831899306
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date: Wed Aug 5 17:47:31 2009 -0700
1.4.2-apple47
diff --git a/configure.ac b/configure.ac
index 9c6549c..1ab51e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.4.2-apple46, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+AC_INIT([xorg-server], 1.4.2-apple47, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([dist-bzip2 foreign])
AM_MAINTAINER_MODE
commit 64c336b7baeb5335a7bf2d5fd1aabf09bc0e1057
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date: Wed Aug 5 17:43:29 2009 -0700
CheckWindowOptionalNeed: Ensure w->optional is set to avoid SEGFAULT
If CheckWindowOptionalNeed is called consecutively (and the first removes optional), then
we will SEGFAULT. This can happen in XQuartz because ReparentWindow will call
pScreen->ReparentWindow which can DeleteProperty which will CheckWindowOptionalNeed... then
ReparentWindow will call it again later indiscriminantly.
(cherry picked from commit b608c864ccc59628bd33c033393121b61580460e)
diff --git a/dix/window.c b/dix/window.c
index fdfc1f3..5daf3df 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -3556,7 +3556,7 @@ CheckWindowOptionalNeed (WindowPtr w)
WindowOptPtr optional;
WindowOptPtr parentOptional;
- if (!w->parent)
+ if (!w->parent || !w->optional)
return;
optional = w->optional;
if (optional->dontPropagateMask != DontPropagateMasks[w->dontPropagate])
More information about the xorg-commit
mailing list