[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Date: Thu, 15 Jun 2017 23:30:48 +0200
From: Bartosz Brachaczek <b.brachaczek@...il.com>
To: musl@...ts.openwall.com
Cc: Bartosz Brachaczek <b.brachaczek@...il.com>
Subject: [PATCH] fix iconv conversions for iso88592-iso885916
commit 97bd6b09dbe7478d5a90a06ecd9e5b59389d8eb9 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.
---
src/locale/iconv.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/locale/iconv.c b/src/locale/iconv.c
index 4636307f..fd2f2e01 100644
--- a/src/locale/iconv.c
+++ b/src/locale/iconv.c
@@ -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;
--
2.13.0
Powered by blists - more mailing lists
Confused about mailing lists and their use?
Read about mailing lists on Wikipedia
and check out these
guidelines on proper formatting of your messages.
