diff options
| author | Cyril Brulebois <kibi@debian.org> | 2011-03-07 22:23:21 +0100 |
|---|---|---|
| committer | Cyril Brulebois <kibi@debian.org> | 2011-03-27 04:25:24 +0200 |
| commit | c26f08f2f056a6c2747478d228ca4f18f4d6a783 (patch) | |
| tree | 17de62acab8d76eca47cf28a9433beb89747fc98 | |
| parent | 03f45df93469f6aef391e97007b9614e0770cc4c (diff) | |
Xext: relax assert in SecurityAuthorizationExpired.pu/35066
The following code path is considered valid:
SecurityAuthorizationExpired
TimerSet
SecurityStartAuthorizationTimer
In other words, SecurityAuthorizationExpired can be called while
pAuth->timer is still NULL, so relax the assert() accordingly.
That might happen when one uses big timeouts in xauth calls, and would
make the server abort.
Debian Bug #616667 <http://bugs.debian.org/616667>
X.Org Bug #27134 <http://bugs.freedesktop.org/show_bug.cgi?id=27134>
X.Org Bug #35066 <http://bugs.freedesktop.org/show_bug.cgi?id=35066>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
| -rw-r--r-- | Xext/security.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Xext/security.c b/Xext/security.c index 8673880d1..003da79e3 100644 --- a/Xext/security.c +++ b/Xext/security.c @@ -312,7 +312,7 @@ SecurityAuthorizationExpired( { SecurityAuthorizationPtr pAuth = (SecurityAuthorizationPtr)pval; - assert(pAuth->timer == timer); + assert((pAuth->timer == NULL) || (pAuth->timer == timer)); if (pAuth->secondsRemaining) { |