AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-13717 During SimpleDateFormat#parseInt, avoid cloning the DecimalFormat unless necessary.

Browse Source 
X-SVN-Rev: 41440
This commit is contained in:
Shane Carr 2018-05-23 04:21:24 +00:00
parent d0d8535066
commit 0c8fed6bde
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
icu4c/source/i18n/smpdtfmt.cpp
View File

@ -3754,21 +3754,19 @@ void SimpleDateFormat::parseInt(const UnicodeString& text,
UBool allowNegative,
const NumberFormat *fmt) const {
UnicodeString oldPrefix;
const DecimalFormat* fmtAsDF = dynamic_cast<const DecimalFormat*>(fmt);
auto* fmtAsDF = dynamic_cast<const DecimalFormat*>(fmt);
LocalPointer<DecimalFormat> df;
if (fmtAsDF != nullptr) {
if (!allowNegative && fmtAsDF != nullptr) {
df.adoptInstead(dynamic_cast<DecimalFormat*>(fmtAsDF->clone()));
}
if (!allowNegative && !df.isNull()) {
fmt = df.getAlias();
df->getNegativePrefix(oldPrefix);
if (df.isNull()) {
// Memory allocation error
return;
}
df->setNegativePrefix(UnicodeString(TRUE, SUPPRESS_NEGATIVE_PREFIX, -1));
fmt = df.getAlias();
}
int32_t oldPos = pos.getIndex();
fmt->parse(text, number, pos);
if (!df.isNull()) {
df->setNegativePrefix(oldPrefix);
}
if (maxDigits > 0) {
// adjust the result to fit into