fix iconv conversions for iso88592-iso885916

commit 97bd6b09db refactored the table
lookup into a function and introduced an error in index computation.
the error caused garbage to be read from the table if the given charmap
had a non-zero number of elided entries.
This commit is contained in:
Bartosz Brachaczek
2017-06-20 20:41:23 -04:00
committed by Rich Felker
parent 64f855874c
commit b7bfb5c3a8
+1 -1
View File
@@ -153,7 +153,7 @@ static void put_32(unsigned char *s, unsigned c, int e)
static unsigned legacy_map(const unsigned char *map, unsigned c)
{
unsigned x = c - 128 + map[-1];
unsigned x = c - 128 - map[-1];
x = legacy_chars[ map[x*5/4]>>2*x%8 |
map[x*5/4+1]<<8-2*x%8 & 1023 ];
return x ? x : c;