From: Eike Ziller <eike.ziller@nokia.com>
Date: Tue, 17 Jul 2012 09:19:02 +0000 (+0200)
Subject: Mac: Don't crash if language preferences can't be retrieved.
X-Git-Tag: v5.0.0-beta1~506
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=67d082223c90912a88f5282af90d8fc05f4a389b;p=profile%2Fivi%2Fqtbase.git

Mac: Don't crash if language preferences can't be retrieved.

That can happen when e.g. running an application with sudo.

Task-number: QTBUG-26547
Change-Id: Ib16ef7798ebcd1c9b8d661dd2e3ce3aadc393489
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
---

diff --git a/src/corelib/tools/qlocale_mac.mm b/src/corelib/tools/qlocale_mac.mm
index 0a74332..f154f3e 100644
--- a/src/corelib/tools/qlocale_mac.mm
+++ b/src/corelib/tools/qlocale_mac.mm
@@ -439,7 +439,7 @@ QVariant QSystemLocale::query(QueryType type, QVariant in = QVariant()) const
                  kCFPreferencesAnyApplication,
                  kCFPreferencesCurrentUser,
                  kCFPreferencesAnyHost);
-        const int cnt = CFArrayGetCount(languages);
+        const int cnt = languages == NULL ? 0 : CFArrayGetCount(languages);
         QStringList result;
         result.reserve(cnt);
         for (int i = 0; i < cnt; ++i) {