From b2566771ca22c2659e63357cfaa1f58d0f429d45 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 1 Jul 2020 14:03:00 +0200 Subject: update to 65.1 https://github.com/remicollet/remirepo/issues/153 --- rhbz1646703-icu4c-ICU-20246-integer-overflow.patch | 50 ---------------------- 1 file changed, 50 deletions(-) delete mode 100644 rhbz1646703-icu4c-ICU-20246-integer-overflow.patch (limited to 'rhbz1646703-icu4c-ICU-20246-integer-overflow.patch') diff --git a/rhbz1646703-icu4c-ICU-20246-integer-overflow.patch b/rhbz1646703-icu4c-ICU-20246-integer-overflow.patch deleted file mode 100644 index 3debd3f..0000000 --- a/rhbz1646703-icu4c-ICU-20246-integer-overflow.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 53d8c8f3d181d87a6aa925b449b51c4a2c922a51 Mon Sep 17 00:00:00 2001 -From: Shane Carr -Date: Mon, 29 Oct 2018 23:52:44 -0700 -Subject: [PATCH] ICU-20246 Fixing another integer overflow in number parsing. - ---- - icu4c/source/i18n/fmtable.cpp | 2 +- - icu4c/source/i18n/number_decimalquantity.cpp | 5 ++++- - icu4c/source/test/intltest/numfmtst.cpp | 8 ++++++++ - .../icu/impl/number/DecimalQuantity_AbstractBCD.java | 5 ++++- - .../impl/number/DecimalQuantity_DualStorageBCD.java | 10 +++++++++- - .../com/ibm/icu/dev/test/format/NumberFormatTest.java | 5 +++++ - 6 files changed, 31 insertions(+), 4 deletions(-) - -erAck: -* obviously removed the icu4j *.java patch parts -* stripped the icu4c/source/test/intltest/numfmtst.cpp part because it - added code to a test that does not exist yet in ICU 62.1 - * TODO: when upgrading to ICU 63.1 add that back in from - https://github.com/unicode-org/icu/commit/53d8c8f3d181d87a6aa925b449b51c4a2c922a51.patch - -diff --git a/icu4c/source/i18n/fmtable.cpp b/icu4c/source/i18n/fmtable.cpp -index 45c7024fc29..8601d95f4a6 100644 ---- a/icu4c/source/i18n/fmtable.cpp -+++ b/icu4c/source/i18n/fmtable.cpp -@@ -734,7 +734,7 @@ CharString *Formattable::internalGetCharString(UErrorCode &status) { - // not print scientific notation for magnitudes greater than -5 and smaller than some amount (+5?). - if (fDecimalQuantity->isZero()) { - fDecimalStr->append("0", -1, status); -- } else if (std::abs(fDecimalQuantity->getMagnitude()) < 5) { -+ } else if (fDecimalQuantity->getMagnitude() != INT32_MIN && std::abs(fDecimalQuantity->getMagnitude()) < 5) { - fDecimalStr->appendInvariantChars(fDecimalQuantity->toPlainString(), status); - } else { - fDecimalStr->appendInvariantChars(fDecimalQuantity->toScientificString(), status); -diff --git a/icu4c/source/i18n/number_decimalquantity.cpp b/icu4c/source/i18n/number_decimalquantity.cpp -index 47b930a564b..d5dd7ae694c 100644 ---- a/icu4c/source/i18n/number_decimalquantity.cpp -+++ b/icu4c/source/i18n/number_decimalquantity.cpp -@@ -898,7 +898,10 @@ UnicodeString DecimalQuantity::toScientificString() const { - } - result.append(u'E'); - int32_t _scale = upperPos + scale; -- if (_scale < 0) { -+ if (_scale == INT32_MIN) { -+ result.append({u"-2147483648", -1}); -+ return result; -+ } else if (_scale < 0) { - _scale *= -1; - result.append(u'-'); - } else { -- cgit