From d2d144a5bd2e62a4d0521592be72b4b0274871d5 Mon Sep 17 00:00:00 2001 From: Markus Scherer Date: Fri, 13 Mar 2020 15:04:11 -0700 Subject: [PATCH] ICU-21009 LocaleMatcher() order[] always set all elements --- icu4c/source/common/localematcher.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/icu4c/source/common/localematcher.cpp b/icu4c/source/common/localematcher.cpp index 2cce3f4b574..7f0dceb66ae 100644 --- a/icu4c/source/common/localematcher.cpp +++ b/icu4c/source/common/localematcher.cpp @@ -421,8 +421,10 @@ LocaleMatcher::LocaleMatcher(const Builder &builder, UErrorCode &errorCode) : U_ASSERT(i == 0); def = &locale; defLSR = &lsr; + order[i] = 1; suppLength = putIfAbsent(lsr, 0, suppLength, errorCode); } else if (lsr.isEquivalentTo(*defLSR)) { + order[i] = 1; suppLength = putIfAbsent(lsr, i, suppLength, errorCode); } else if (localeDistance.isParadigmLSR(lsr)) { order[i] = 2;