blob: 721c2b31b9145f74d80d6ec871f729e9b240df73 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
|
From b7bfb5c3a8330002250f304cb5deb522fa054eae Mon Sep 17 00:00:00 2001
From: Bartosz Brachaczek <b.brachaczek@gmail.com>
Date: Thu, 15 Jun 2017 23:30:48 +0200
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
|
