From d8f8d7aec150fc0866c5382b06848987de264f6d Mon Sep 17 00:00:00 2001 From: Lukasz Pik Date: Wed, 27 Sep 2017 14:53:40 +0200 Subject: [PATCH] [ACR-1045]Fix error in i18n_plural_rules_get_keywords() Change-Id: I7fddde17261cec158c57f89ce7a7adf238dd3a78 Signed-off-by: Lukasz Pik (cherry picked from commit 9841335bb411f561734e11a9e8e99a71eaa0da01) --- src/utils_i18n_plural_rules.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/utils_i18n_plural_rules.cpp b/src/utils_i18n_plural_rules.cpp index 4feb629..54ae3d6 100644 --- a/src/utils_i18n_plural_rules.cpp +++ b/src/utils_i18n_plural_rules.cpp @@ -129,7 +129,9 @@ int i18n_plural_rules_get_keywords(i18n_plural_rules_h plural_rules, i18n_uenume retv_if(string_enum == NULL, I18N_ERROR_INVALID_PARAMETER); UErrorCode status = U_ZERO_ERROR; - *string_enum = ((PluralRules *)plural_rules)->getKeywords(status); + StringEnumeration *stringEnumeration = ((PluralRules *)plural_rules)->getKeywords(status); + if (stringEnumeration != NULL && _i18n_error_mapping(status) == I18N_ERROR_NONE) + *string_enum = uenum_openFromStringEnumeration(stringEnumeration, &status); return _i18n_error_mapping(status); } -- 2.34.1