Itms/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fix L10n::FormatMillisecondsIntoDateString memory leak following c92e74138a, refs a74fcdcb35, #3350, #4418, #2938.

Browse Source 
createDefault returns a new pointer to be deleted, getGMT returned a
pointer to an icu variable not to be deleted.

Differential Revision: https://code.wildfiregames.com/D2220
Reviewed By: Vladislav
This was SVN commit r22773.
This commit is contained in:
elexis 2019-08-24 17:33:29 +00:00
parent 62dd922bc0
commit 55efe4a735
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/i18n/L10n.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2018 Wildfire Games.
/* Copyright (C) 2019 Wildfire Games.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
@ -386,10 +386,11 @@ std::string L10n::FormatMillisecondsIntoDateString(const UDate milliseconds, con
if (U_FAILURE(status))
LOGERROR("Error creating SimpleDateFormat: %s", u_errorName(status));
const icu::TimeZone* timeZone = useLocalTimezone ? icu::TimeZone::createDefault() : icu::TimeZone::getGMT() ;
status = U_ZERO_ERROR;
icu::Calendar* calendar = icu::Calendar::createInstance(*timeZone, currentLocale, status);
icu::Calendar* calendar = useLocalTimezone ?
icu::Calendar::createInstance(currentLocale, status) :
icu::Calendar::createInstance(*icu::TimeZone::getGMT(), currentLocale, status);
if (U_FAILURE(status))
LOGERROR("Error creating calendar: %s", u_errorName(status));