From: Samuel Rødal <samuel.rodal@digia.com>
Date: Mon, 26 Nov 2012 15:39:40 +0000 (+0100)
Subject: Fixed crash in tst_qglthreads.
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6633dbbac49f4ce8a89b67090fdffaa8c8126eb5;p=profile%2Fivi%2Fqtbase.git

Fixed crash in tst_qglthreads.

QGLTextureCache has a read write locker to protect texture lookups.
However, even calling QCache::object() might modify the cache, causing
race conditions, since it modifies the priority order of the objects in
the cache. Therefore, we need to protect it with a QWriteLocker instead
of a QReadLocker.

Task-number: QTBUG-22560
Change-Id: I46fffc624ace27e25fb100f865e1df0a19b9093d
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
---

diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h
index 58f6a94..7154545 100644
--- a/src/opengl/qgl_p.h
+++ b/src/opengl/qgl_p.h
@@ -504,7 +504,7 @@ int QGLTextureCache::maxCost()
 
 QGLTexture* QGLTextureCache::getTexture(QGLContext *ctx, qint64 key)
 {
-    QReadLocker locker(&m_lock);
+    QWriteLocker locker(&m_lock);
     const QGLTextureCacheKey cacheKey = {key, QGLContextPrivate::contextGroup(ctx)};
     return m_cache.object(cacheKey);
 }