X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ficu_sortkey.c;h=c9fc3805d5fca603462f056626f6b8d9e4a7164b;hb=4493d0acd68f0d3f1b0f1b6c79e3934bfa3207ed;hp=8fed3948a4f6ffc55519e1e80b71a2548261e103;hpb=9a23e52dbba0f2f6d7ab85361e3c53ac9f222446;p=yaz-moved-to-github.git diff --git a/src/icu_sortkey.c b/src/icu_sortkey.c index 8fed394..c9fc380 100644 --- a/src/icu_sortkey.c +++ b/src/icu_sortkey.c @@ -32,12 +32,15 @@ void icu_sortkey8_from_utf16(UCollator *coll, UErrorCode * status) { int32_t sortkey_len = 0; - + /* we'll fake a capacity of one less, because it turns out + that ucol_getSortKey writes ONE character too much */ + int32_t cap = dest8->utf8_cap ? dest8->utf8_cap - 1 : 0; + sortkey_len = ucol_getSortKey(coll, src16->utf16, src16->utf16_len, - dest8->utf8, dest8->utf8_cap); + dest8->utf8, cap); /* check for buffer overflow, resize and retry */ - if (sortkey_len > dest8->utf8_cap) + if (sortkey_len > cap) { icu_buf_utf8_resize(dest8, sortkey_len * 2); sortkey_len = ucol_getSortKey(coll, src16->utf16, src16->utf16_len,