From f0a892a46fdc438277c8b401c267db4bd92aec1b Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@nokia.com>
Date: Mon, 13 Dec 2010 14:50:07 +0100
Subject: Fix ABA problem with: the serial must be updated on all accesses

The nextFreeTimerId's serial counter was only being updated on timer
ID releasing. It needs to be updated on allocation too.

Reviewed-by: Bradley T. Hughes
---
 src/corelib/kernel/qabstracteventdispatcher.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/corelib/kernel/qabstracteventdispatcher.cpp b/src/corelib/kernel/qabstracteventdispatcher.cpp
index 1c1c6e3..5619921 100644
--- a/src/corelib/kernel/qabstracteventdispatcher.cpp
+++ b/src/corelib/kernel/qabstracteventdispatcher.cpp
@@ -151,7 +151,7 @@ int QAbstractEventDispatcherPrivate::allocateTimerId()
             }
         }
 
-        newTimerId = b[at];
+        newTimerId = prepareNewValueWithSerialNumber(timerId, b[at]);
     } while (!nextFreeTimerId.testAndSetRelaxed(timerId, newTimerId));
 
     return timerId;
-- 
cgit v0.12