aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/icu/Collate.cxx
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2014-02-24 21:05:34 +0100
committerMax Kellermann <max@duempel.org>2014-02-24 21:05:44 +0100
commit3f4c283203aa9cacf4ce43632d436805d854f3a3 (patch)
tree83c5598131993334fe6a913967b0878aa230475d /src/lib/icu/Collate.cxx
parent1e63e7c08bd595bac9ec889c16d61dd8b2b84974 (diff)
downloadmpd-3f4c283203aa9cacf4ce43632d436805d854f3a3.tar.gz
mpd-3f4c283203aa9cacf4ce43632d436805d854f3a3.tar.xz
mpd-3f4c283203aa9cacf4ce43632d436805d854f3a3.zip
icu/Collate: pass UErrorCode* to ucol_strcollUTF8()
Fixes crash after database update.
Diffstat (limited to 'src/lib/icu/Collate.cxx')
-rw-r--r--src/lib/icu/Collate.cxx3
1 files changed, 2 insertions, 1 deletions
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() */