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-20869 Fix compiler warning in FixedDecimal::getFractionalDigits().

Browse source 
Fix a clang compiler warning and a potential undefined behavior arising
from casting an out-of-range double to an int. See the Jira ticket for a
more detailed description of the problem.

This PR is to fix the immediate problem. Longer term, the function
may be replaced entirely - see issue ICU-21147.
This commit is contained in:
Andy Heninger 2020-06-01 12:59:47 -07:00
parent 3b17a492be
commit 99dc49a0c0
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
icu4c/source/i18n/plurrule.cpp
View file

@ -1661,7 +1661,9 @@ int64_t FixedDecimal::getFractionalDigits(double n, int32_t v) {
case 3: return (int64_t)(fract*1000.0 + 0.5);
default:
double scaled = floor(fract * pow(10.0, (double)v) + 0.5);
if (scaled > U_INT64_MAX) {
if (scaled >= static_cast<double>(U_INT64_MAX)) {
// Note: a double cannot accurately represent U_INT64_MAX. Casting it to double
// will round up to the next representable value, which is U_INT64_MAX + 1.
return U_INT64_MAX;
} else {
return (int64_t)scaled;