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

ICU-13177 Fixing coverity issues in number formatting code.

Browse Source 
X-SVN-Rev: 40554
This commit is contained in:
Shane Carr 2017-10-04 22:29:21 +00:00
parent e2f537d42f
commit 302c255931
11 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
icu4c/source/i18n/number_compact.cpp
View File

@ -216,7 +216,6 @@ CompactHandler::CompactHandler(CompactStyle compactStyle, const Locale &locale,
UErrorCode &status)
: rules(rules), parent(parent) {
data.populate(locale, nsName, compactStyle, compactType, status);
if (U_FAILURE(status)) { return; }
if (buildReference != nullptr) {
// Safe code path
precomputeAllModifiers(*buildReference, status);
@ -234,6 +233,8 @@ CompactHandler::~CompactHandler() {
}
void CompactHandler::precomputeAllModifiers(MutablePatternModifier &buildReference, UErrorCode &status) {
if (U_FAILURE(status)) { return; }
// Initial capacity of 12 for 0K, 00K, 000K, ...M, ...B, and ...T
UVector allPatterns(12, status);
if (U_FAILURE(status)) { return; }
@ -306,8 +307,8 @@ void CompactHandler::processQuantity(DecimalQuantity &quantity, MicroProps &micr
// C++ Note: Use unsafePatternInfo for proper lifecycle.
ParsedPatternInfo &patternInfo = const_cast<CompactHandler *>(this)->unsafePatternInfo;
PatternParser::parseToPatternInfo(UnicodeString(patternString), patternInfo, status);
dynamic_cast<MutablePatternModifier *>(const_cast<Modifier *>(micros.modMiddle))->setPatternInfo(
&patternInfo);
static_cast<MutablePatternModifier*>(const_cast<Modifier*>(micros.modMiddle))
->setPatternInfo(&patternInfo);
numDigits = patternInfo.positive.integerTotal;
}

1
icu4c/source/i18n/number_decimalquantity.cpp
View File

@ -80,6 +80,7 @@ static double DOUBLE_MULTIPLIERS[] = {
DecimalQuantity::DecimalQuantity() {
setBcdToZero();
flags = 0;
}
DecimalQuantity::~DecimalQuantity() {

2
icu4c/source/i18n/number_longnames.cpp
View File

@ -30,7 +30,7 @@ class PluralTableSink : public ResourceSink {
}
}
void put(const char *key, ResourceValue &value, UBool /*noFallback*/, UErrorCode &status) override {
void put(const char *key, ResourceValue &value, UBool /*noFallback*/, UErrorCode &status) U_OVERRIDE {
ResourceTable pluralsTable = value.getTable(status);
if (U_FAILURE(status)) { return; }
for (int i = 0; pluralsTable.getKeyAndValue(i, key, value); ++i) {

3
icu4c/source/i18n/number_modifiers.cpp
View File

@ -87,7 +87,8 @@ SimpleModifier::SimpleModifier(const SimpleFormatter &simpleFormatter, Field fie
}
}
SimpleModifier::SimpleModifier() : fStrong(false), fPrefixLength(0), fSuffixLength(0) {
SimpleModifier::SimpleModifier()
: fField(UNUM_FIELD_COUNT), fStrong(false), fPrefixLength(0), fSuffixLength(0) {
}
int32_t SimpleModifier::apply(NumberStringBuilder &output, int leftIndex, int rightIndex,

12
icu4c/source/i18n/number_patternmodifier.h
View File

@ -189,28 +189,28 @@ class U_I18N_API MutablePatternModifier
UnicodeString toUnicodeString() const U_OVERRIDE;
private:
// Modifier details
// Modifier details (initialized in constructor)
const bool fStrong;
// Pattern details
// Pattern details (initialized in setPatternInfo and setPatternAttributes)
const AffixPatternProvider *patternInfo;
UNumberSignDisplay signDisplay;
bool perMilleReplacesPercent;
// Symbol details
// Symbol details (initialized in setSymbols)
const DecimalFormatSymbols *symbols;
UNumberUnitWidth unitWidth;
char16_t currencyCode[4];
const PluralRules *rules;
// Number details
// Number details (initialized in setNumberProperties)
bool isNegative;
StandardPlural::Form plural;
// QuantityChain details
// QuantityChain details (initialized in addToChain)
const MicroPropsGenerator *parent;
// Transient CharSequence fields
// Transient CharSequence fields (initialized in enterCharSequenceMode)
bool inCharSequenceMode = false;
int32_t fFlags;
int32_t fLength;

4
icu4c/source/i18n/number_patternstring.cpp
View File

@ -23,7 +23,7 @@ PatternParser::parseToProperties(const UnicodeString& pattern, IgnoreRounding ig
return properties;
}
void PatternParser::parseToExistingProperties(const UnicodeString& pattern, DecimalFormatProperties properties,
void PatternParser::parseToExistingProperties(const UnicodeString& pattern, DecimalFormatProperties& properties,
IgnoreRounding ignoreRounding, UErrorCode &status) {
parseToExistingPropertiesImpl(pattern, properties, ignoreRounding, status);
}
@ -447,7 +447,7 @@ PatternParser::parseToExistingPropertiesImpl(const UnicodeString& pattern, Decim
}
void PatternParser::patternInfoToProperties(DecimalFormatProperties &properties,
ParsedPatternInfo patternInfo,
ParsedPatternInfo& patternInfo,
IgnoreRounding _ignoreRounding, UErrorCode &status) {
// Translate from PatternParseResult to Properties.
// Note that most data from "negative" is ignored per the specification of DecimalFormat.

4
icu4c/source/i18n/number_patternstring.h
View File

@ -186,7 +186,7 @@ class U_I18N_API PatternParser {
* @throws IllegalArgumentException
* If there was a syntax error in the pattern string.
*/
static void parseToExistingProperties(const UnicodeString& pattern, DecimalFormatProperties properties,
static void parseToExistingProperties(const UnicodeString& pattern, DecimalFormatProperties& properties,
IgnoreRounding ignoreRounding, UErrorCode &status);
private:
@ -196,7 +196,7 @@ class U_I18N_API PatternParser {
/** Finalizes the temporary data stored in the ParsedPatternInfo to the Properties. */
static void
patternInfoToProperties(DecimalFormatProperties &properties, ParsedPatternInfo patternInfo,
patternInfoToProperties(DecimalFormatProperties &properties, ParsedPatternInfo& patternInfo,
IgnoreRounding _ignoreRounding, UErrorCode &status);
};

3
icu4j/main/classes/core/src/com/ibm/icu/impl/number/MacroProps.java
View File

@ -74,6 +74,9 @@ public class MacroProps implements Cloneable {
@Override
public boolean equals(Object _other) {
if (_other == null) return false;
if (this == _other) return true;
if (!(_other instanceof MacroProps)) return false;
MacroProps other = (MacroProps) _other;
return Utility.equals(notation, other.notation)
&& Utility.equals(unit, other.unit)

2
icu4j/main/classes/core/src/com/ibm/icu/impl/number/MultiplierImpl.java
View File

@ -4,7 +4,7 @@ package com.ibm.icu.impl.number;
import java.math.BigDecimal;
public class MultiplierImpl implements MicroPropsGenerator, Cloneable {
public class MultiplierImpl implements MicroPropsGenerator {
final int magnitudeMultiplier;
final BigDecimal bigDecimalMultiplier;
final MicroPropsGenerator parent;

3
icu4j/main/classes/core/src/com/ibm/icu/impl/number/SimpleModifier.java
View File

@ -22,7 +22,8 @@ public class SimpleModifier implements Modifier {
/** Creates a modifier that uses the SimpleFormatter string formats. */
public SimpleModifier(String compiledPattern, Field field, boolean strong) {
this.compiledPattern = (compiledPattern == null) ? "\u0001\u0000" : compiledPattern;
assert compiledPattern != null;
this.compiledPattern = compiledPattern;
this.field = field;
this.strong = strong;

2
icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/IntlTestDecimalFormatSymbols.java
View File

@ -293,7 +293,7 @@ public class IntlTestDecimalFormatSymbols extends TestFmwk
"\uD801\uDCA0", "\uD801\uDCA1", "\uD801\uDCA2", "\uD801\uDCA3", "\uD801\uDCA4",
"\uD801\uDCA5", "\uD801\uDCA6", "\uD801\uDCA7", "\uD801\uDCA8", "\uD801\uDCA9"
};
final String[] differentDigitStrings = {"0", "b", "3", "d", "5", "f", "7", "h", "9", "j"};
final String[] differentDigitStrings = {"0", "b", "3", "d", "5", "ff", "7", "h", "9", "j"};
DecimalFormatSymbols symbols = new DecimalFormatSymbols(Locale.ENGLISH);