summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2014-03-18 13:49:44 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-03-19 01:01:38 +0100
commit4fc3d9ba6301a8c28a1f4ddf1665b0fe49ce092d (patch)
tree72ca784e714babe452997e93fb78200ea7cf2392
parenta1af25290bbd078628e362d4b704a047853d620c (diff)
Fix double release in QTimeZone on Mac
availableTimeZoneIds would release the enumerator. This leads to a double free, so simply don't release the enumerator. Task-number: QTBUG-37582 Change-Id: I521a9555d32545afd47095235ccee75a4f3e1974 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
-rw-r--r--src/corelib/tools/qtimezoneprivate_mac.mm1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/corelib/tools/qtimezoneprivate_mac.mm b/src/corelib/tools/qtimezoneprivate_mac.mm
index 3d95377850..49930490ff 100644
--- a/src/corelib/tools/qtimezoneprivate_mac.mm
+++ b/src/corelib/tools/qtimezoneprivate_mac.mm
@@ -272,7 +272,6 @@ QSet<QByteArray> QMacTimeZonePrivate::availableTimeZoneIds() const
tzid = QCFString::toQString([enumerator nextObject]).toUtf8();
}
- [enumerator release];
return set;
}