possible fix for #128 (#129)

Does this help? I do not really remember what I wrote back then
This commit is contained in:
Benito van der Zander 2018-04-27 14:06:14 +02:00 committed by Steven G. Johnson
parent 6a20831a07
commit acc204f1f1

View File

@ -631,9 +631,9 @@ UTF8PROC_DLLEXPORT utf8proc_ssize_t utf8proc_normalize_utf32(utf8proc_int32_t *b
current_property->comb_index != UINT16_MAX && current_property->comb_index != UINT16_MAX &&
current_property->comb_index >= 0x8000) { current_property->comb_index >= 0x8000) {
int sidx = starter_property->comb_index; int sidx = starter_property->comb_index;
int idx = (current_property->comb_index & 0x3FFF) - utf8proc_combinations[sidx]; int idx = current_property->comb_index & 0x3FFF;
if (idx >= 0 && idx <= utf8proc_combinations[sidx + 1] ) { if (idx >= utf8proc_combinations[sidx] && idx <= utf8proc_combinations[sidx + 1] ) {
idx += sidx + 2; idx += sidx + 2 - utf8proc_combinations[sidx];
if (current_property->comb_index & 0x4000) { if (current_property->comb_index & 0x4000) {
composition = (utf8proc_combinations[idx] << 16) | utf8proc_combinations[idx+1]; composition = (utf8proc_combinations[idx] << 16) | utf8proc_combinations[idx+1];
} else } else