From 435361bd73b9fc733f093d81af6b839953e35176 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Mon, 6 Dec 2010 20:38:14 -0800 Subject: [PATCH] sync: syncObject may be None in SyncInitTrigger And often is, especially when called from ProcSyncCreateAlarm. Crashing in this case seems unwise. Signed-off-by: Keith Packard --- Xext/sync.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Xext/sync.c b/Xext/sync.c index ce00755b4..ab8f20d5c 100644 --- a/Xext/sync.c +++ b/Xext/sync.c @@ -296,7 +296,7 @@ SyncInitTrigger(ClientPtr client, SyncTrigger *pTrigger, XID syncObject, /* if system counter, ask it what the current value is */ - if (SYNC_COUNTER == pSync->type) + if (pSync && SYNC_COUNTER == pSync->type) { pCounter = (SyncCounter *)pSync; @@ -320,7 +320,7 @@ SyncInitTrigger(ClientPtr client, SyncTrigger *pTrigger, XID syncObject, if (changes & XSyncCATestType) { - if (SYNC_FENCE == pSync->type) + if (pSync && SYNC_FENCE == pSync->type) { pTrigger->CheckTrigger = SyncCheckTriggerFence; }