AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix leak in date and time formatting on macOS

Browse Source 
CFDateFormatterCreateStringWithDate() creates a CFStringRef that we
need to tidy up once we're done with it, so use the QCFType template
to take care of that.

Change-Id: Ibc3751426cc4496bce25307918fdb11722cde3b2
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
This commit is contained in:
Edward Welbourne 2021-11-15 17:15:44 +01:00
parent a8a003aba2
commit 3b84187cd1
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/corelib/text/qlocale_mac.mm
View File

@ -157,7 +157,8 @@ static QVariant macDateToString(QDate date, bool short_format)
= CFDateFormatterCreate(kCFAllocatorDefault, = CFDateFormatterCreate(kCFAllocatorDefault,
mylocale, style, mylocale, style,
kCFDateFormatterNoStyle); kCFDateFormatterNoStyle);
return QString::fromCFString(CFDateFormatterCreateStringWithDate(0, myFormatter, myDate)); QCFType<CFStringRef> text = CFDateFormatterCreateStringWithDate(0, myFormatter, myDate);
return QString::fromCFString(text);
} }
static QVariant macTimeToString(QTime time, bool short_format) static QVariant macTimeToString(QTime time, bool short_format)
@ -169,7 +170,8 @@ static QVariant macTimeToString(QTime time, bool short_format)
mylocale, mylocale,
kCFDateFormatterNoStyle, kCFDateFormatterNoStyle,
style); style);
return QString::fromCFString(CFDateFormatterCreateStringWithDate(0, myFormatter, myDate)); QCFType<CFStringRef> text = CFDateFormatterCreateStringWithDate(0, myFormatter, myDate);
return QString::fromCFString(text);
} }
// Mac uses the Unicode CLDR format codes // Mac uses the Unicode CLDR format codes