Skip to content

Commit a84d395

Browse files
committed
FIX: incorrect codepage id for CP819 alias IBM819 codepage name
1 parent 1fdda56 commit a84d395

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

src/core/u-iconv.c

+4-5
Original file line numberDiff line numberDiff line change
@@ -119,14 +119,13 @@ static struct {
119119
{20127, "US-ASCII"},
120120
{20127, "CSASCII"},
121121

122-
/* !IsValidCodePage(819) */
123-
{1252, "CP819"},
124-
{1252, "IBM819"},
125122
{28591, "ISO-8859-1"},
126123
{28591, "ISO-IR-100"},
127124
{28591, "ISO8859-1"},
128125
{28591, "ISO_8859-1"},
129126
{28591, "ISO_8859-1:1987"},
127+
{28591, "CP819"},
128+
{28591, "IBM819"},
130129
{28591, "L1"},
131130
{28591, "LATIN1"},
132131
{28591, "CSISOLATIN1"},
@@ -769,7 +768,7 @@ static REBYTE* get_codepage_name(REBVAL *cp)
769768
Trap0(RE_FEATURE_NA);
770769
}
771770

772-
dst_wide = Make_Series(src_len + 1, wide, FALSE);
771+
dst_wide = Make_Series(src_len + 4, wide, FALSE);
773772
dst_size = SERIES_SPACE(dst_wide);
774773

775774

@@ -782,7 +781,7 @@ static REBYTE* get_codepage_name(REBVAL *cp)
782781
nread = iconv(cd, &src, &src_size, &dst, &dst_size);
783782
//printf("ret: %d src_size: %d dst_size: %d %d\n", nread, src_size, dst_size, (REBYTE *)dst - BIN_HEAD(dst_wide));
784783
if(nread == (size_t)-1) {
785-
//printf("iconv failed: %d\n", errno );
784+
printf("iconv failed: %d\n", errno );
786785
if(errno == E2BIG) {
787786
// There is not sufficient room at destination
788787
if (SERIES_SPACE(dst_wide) < (4 * src_len)) {

0 commit comments

Comments
 (0)