organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-21 12:40:02 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-8892 Merging th e fix for critical DecimalFormat problem (#8561) to the ICU4C 4.8 maintenance stream.

Browse source 
X-SVN-Rev: 31738
This commit is contained in:
Yoshito Umaoka 2012-04-18 21:13:11 +00:00
parent d76d23a7da
commit 0f720a79f2
1 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
source/i18n/digitlst.cpp
View file

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (C) 1997-2011, International Business Machines
* Copyright (C) 1997-2012, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
*
@ -60,6 +60,18 @@ static const char I64_MIN_REP[] = "9223372036854775808";
U_NAMESPACE_BEGIN
static void
loadDecimalChar() {
if (gDecimal == 0) {
char rep[MAX_DIGITS];
// For machines that decide to change the decimal on you,
// and try to be too smart with localization.
// This normally should be just a '.'.
sprintf(rep, "%+1.1f", 1.0);
gDecimal = rep[2];
}
}
// -------------------------------------
// default constructor
@ -408,15 +420,6 @@ DigitList::getDouble() const
}
DigitList *nonConstThis = const_cast<DigitList *>(this);
if (gDecimal == 0) {
char rep[MAX_DIGITS];
// For machines that decide to change the decimal on you,
// and try to be too smart with localization.
// This normally should be just a '.'.
sprintf(rep, "%+1.1f", 1.0);
gDecimal = rep[2];
}
if (isZero()) {
nonConstThis->fDouble = 0.0;
if (decNumberIsNegative(fDecNumber)) {
@ -451,6 +454,7 @@ DigitList::getDouble() const
}
U_ASSERT(uprv_strlen(&s[0]) < MAX_DBL_DIGITS+18);
loadDecimalChar();
if (gDecimal != '.') {
char *decimalPt = strchr(s, '.');
if (decimalPt != NULL) {
@ -741,6 +745,17 @@ DigitList::set(double source)
sprintf(rep, "%+1.*e", MAX_DBL_DIGITS - 1, source);
U_ASSERT(uprv_strlen(rep) < sizeof(rep));
// uprv_decNumberFromString() will parse the string expecting '.' as a
// decimal separator, however sprintf() can use ',' in certain locales.
// Overwrite a different decimal separator with '.' here before proceeding.
loadDecimalChar();
if (gDecimal != '.') {
char *decimalPt = strchr(rep, gDecimal);
if (decimalPt != NULL) {
*decimalPt = '.';
}
}
// Create a decNumber from the string.
uprv_decNumberFromString(fDecNumber, rep, &fContext);
uprv_decNumberTrim(fDecNumber);