organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-06 14:05:32 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 8

ICU-21613 Fix undefined behaviour in ComplexUnitsConverter::applyRounder

Browse source
This commit is contained in:
Hugo van der Merwe 2021-11-30 00:23:30 +01:00
parent 0b50a5f22a
commit 54e4120738
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
icu4c/source/i18n/units_complexconverter.cpp
View file

@ -183,7 +183,7 @@ MaybeStackVector<Measure> ComplexUnitsConverter::convert(double quantity,
} else {
quantity = remainder;
}
}
}
}
applyRounder(intValues, quantity, rounder, status);
@ -210,7 +210,6 @@ MaybeStackVector<Measure> ComplexUnitsConverter::convert(double quantity,
}
}
// Transfer values into result and return:
for(int32_t i = 0, n = unitsConverters_.length(); i < n; ++i) {
U_ASSERT(tmpResult[i] != nullptr);
@ -224,6 +223,12 @@ MaybeStackVector<Measure> ComplexUnitsConverter::convert(double quantity,
void ComplexUnitsConverter::applyRounder(MaybeStackArray<int64_t, 5> &intValues, double &quantity,
icu::number::impl::RoundingImpl *rounder,
UErrorCode &status) const {
if (uprv_isInfinite(quantity) || uprv_isNaN(quantity)) {
// Inf and NaN can't be rounded, and calculating `carry` below is known
// to fail on Gentoo on HPPA and OpenSUSE on riscv64. Nothing to do.
return;
}
if (rounder == nullptr) {
// Nothing to do for the quantity.
return;