From be2e0f75ae2e55f235b34b402b70628a839b7782 Mon Sep 17 00:00:00 2001
From: jian liang <jianliang79@gmail.com>
Date: Sun, 20 Sep 2015 23:08:59 +0800
Subject: [PATCH] Free the QFreeList object allocated memory on exit

This memory allocation was introduced in
314c83c0c2f91532654f869b7dc6af1b7e8538da. With a compiler without thread
safe statics support mutex.cpp use a function named freelist() to create
the global QFreeList object. it will be created when the first time it was
accessed, but will never be released. This patch use Q_DESTRUCTOR_FUNCTION
to delete this object.

Task-number: QTBUG-48359
Change-Id: I4e4716930930aa98630101a1f96de6a7672af9cb
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/corelib/thread/qmutex.cpp | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/corelib/thread/qmutex.cpp b/src/corelib/thread/qmutex.cpp
index 3269ee3ae8..742a572bef 100644
--- a/src/corelib/thread/qmutex.cpp
+++ b/src/corelib/thread/qmutex.cpp
@@ -571,19 +571,26 @@ FreeList *freelist()
     return &list;
 }
 #else
+static QBasicAtomicPointer<FreeList> freeListPtr;
+
 FreeList *freelist()
 {
-    static QAtomicPointer<FreeList> list;
-    FreeList *local = list.loadAcquire();
+    FreeList *local = freeListPtr.loadAcquire();
     if (!local) {
         local = new FreeList;
-        if (!list.testAndSetRelease(0, local)) {
+        if (!freeListPtr.testAndSetRelease(0, local)) {
             delete local;
-            local = list.loadAcquire();
+            local = freeListPtr.loadAcquire();
         }
     }
     return local;
 }
+
+static void qFreeListDeleter()
+{
+    delete freeListPtr.load();
+}
+Q_DESTRUCTOR_FUNCTION(qFreeListDeleter)
 #endif
 }