From 3f4c283203aa9cacf4ce43632d436805d854f3a3 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 24 Feb 2014 21:05:34 +0100 Subject: icu/Collate: pass UErrorCode* to ucol_strcollUTF8() Fixes crash after database update. --- src/lib/icu/Collate.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/icu/Collate.cxx b/src/lib/icu/Collate.cxx index 27db10398..3e8a6f5b5 100644 --- a/src/lib/icu/Collate.cxx +++ b/src/lib/icu/Collate.cxx @@ -109,7 +109,8 @@ IcuCollate(const char *a, const char *b) assert(collator != nullptr); #if U_ICU_VERSION_MAJOR_NUM >= 50 - return (int)ucol_strcollUTF8(collator, a, -1, b, -1, nullptr); + UErrorCode code = U_ZERO_ERROR; + return (int)ucol_strcollUTF8(collator, a, -1, b, -1, &code); #else /* fall back to ucol_strcoll() */ -- cgit v1.2.3