From 015d7cd6d0d2bd22a74ee1b06e703eb876336bec Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@nokia.com>
Date: Fri, 21 Aug 2009 19:18:38 +0200
Subject: Fix crash at program exit: Q_GLOBAL_STATIC is zeroed.

When libraryData() is 0, &libraryData()->map is 0x4. So make sure we
return 0 if libraryData() is null too.

Reviewed-by: TrustMe
---
 src/corelib/plugin/qlibrary.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/corelib/plugin/qlibrary.cpp b/src/corelib/plugin/qlibrary.cpp
index 5cf6513..51b3a50 100644
--- a/src/corelib/plugin/qlibrary.cpp
+++ b/src/corelib/plugin/qlibrary.cpp
@@ -436,7 +436,8 @@ Q_GLOBAL_STATIC(LibraryData, libraryData)
 
 static LibraryMap *libraryMap()
 {
-    return &(libraryData()->libraryMap);
+    LibraryData *data = libraryData();
+    return data ? &data->libraryMap : 0;
 }
 
 QLibraryPrivate::QLibraryPrivate(const QString &canonicalFileName, const QString &version)
-- 
cgit v0.12