OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update. 

* iconvdata/sjis.c: In conversion from UCS4, correct test for
	enough room in target buffer.
	Patch by KUSANO Takayuki <AE5T-KSN@asahi-net.or.jp> [PR libc/1865].
	* iconvdata/bug-iconv1.c: New file.
	* iconvdata/Makefile (tests): Add bug-iconv1.
This commit is contained in:
Ulrich Drepper 2000-08-23 05:52:43 +00:00
parent dc63ee3575
commit cf970a3215
4 changed files with 52 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,5 +1,11 @@
2000-08-22 Ulrich Drepper <drepper@redhat.com>
* iconvdata/sjis.c: In conversion from UCS4, correct test for
enough room in target buffer.
Patch by KUSANO Takayuki <AE5T-KSN@asahi-net.or.jp> [PR libc/1865].
* iconvdata/bug-iconv1.c: New file.
* iconvdata/Makefile (tests): Add bug-iconv1.
* locale/iso-4217.def: Update entry for Nicaragua.
2000-08-22 Mark Kettenis <kettenis@gnu.org>

2
iconvdata/Makefile
View File

@ -49,6 +49,8 @@ modules := ISO8859-1 ISO8859-2 ISO8859-3 ISO8859-4 ISO8859-5 \
modules.so := $(addsuffix .so, $(modules))
tests = bug-iconv1
include ../Makeconfig
libJIS-routines := jis0201 jis0208 jis0212

40
iconvdata/bug-iconv1.c Normal file
View File

@ -0,0 +1,40 @@
/* Test program by Satoru Takabayashi. */
#include <errno.h>
#include <iconv.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
int
main (int argc, char **argv)
{
const char in[] = "\x41\x42\x43\xa4\xa2\xa4\xa4\xa4\xa6\xa4\xa8\xa4\xaa";
/* valid eucJP string */
const char exp[] = "\x41\x42\x43\x82\xa0\x82\xa2\x82\xa4";
size_t outbufsize = 10;
/* 10 is too small to store full result (intentional) */
size_t inleft, outleft;
char *in_p = (char *) in;
char out[outbufsize];
char *out_p = out;
iconv_t cd;
int i;
inleft = strlen (in);
outleft = outbufsize;
cd = iconv_open ("SJIS", "eucJP");
if (cd == (iconv_t) -1)
{
puts ("iconv_open failed");
exit (1);
}
iconv (cd, &in_p, &inleft, &out_p, &outleft); /* this returns E2BIG */
for (i = 0; i < outbufsize - outleft; ++i)
printf (" %02x", (unsigned char) out[i]);
puts ("");
iconv_close (cd);
return outbufsize - outleft != 9 || memcmp (out, exp, 9) != 0;
}

7
iconvdata/sjis.c
View File

@ -4484,18 +4484,19 @@ static const char from_ucs4_extra[0x100][2] =
} \
else \
{ \
*outptr++ = cp[0]; \
*outptr = cp[0]; \
/* Now test for a possible second byte and write this if possible. */\
if (cp[1] != '\0') \
{ \
if (__builtin_expect (outptr >= outend, 0)) \
if (__builtin_expect (outptr + 1 >= outend, 0)) \
{ \
/* The result does not fit into the buffer. */ \
result = __GCONV_FULL_OUTPUT; \
break; \
} \
*outptr++ = cp[1]; \
*++outptr = cp[1]; \
} \
++outptr; \
} \
\
inptr += 4; \