FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

natIconv.cc (read): Handle EINVAL and E2BIG correctly.

Browse source 
* gnu/gcj/convert/natIconv.cc (read): Handle EINVAL and E2BIG
	correctly.

From-SVN: r44928
This commit is contained in:
Tom Tromey 2001-08-15 20:24:00 +00:00 • committed by Tom Tromey
parent 44ce006366
commit 369e1d74c6
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libjava/ChangeLog
View file

@ -1,3 +1,8 @@
2001-08-15 Tom Tromey <tromey@redhat.com>
* gnu/gcj/convert/natIconv.cc (read): Handle EINVAL and E2BIG
correctly.
2001-08-09 Tom Tromey <tromey@redhat.com>
* java/awt/image/SampleModel.java (getPixel): Set correct array

11
libjava/gnu/gcj/convert/natIconv.cc
View file

@ -90,10 +90,13 @@ gnu::gcj::convert::Input_iconv::read (jcharArray outbuffer,
if (r == (size_t) -1)
{
// Incomplete character.
if (errno == EINVAL || errno == E2BIG)
return 0;
throw new java::io::CharConversionException ();
// If we see EINVAL then there is an incomplete sequence at the
// end of the input buffer. If we see E2BIG then we ran out of
// space in the output buffer. However, in both these cases
// some conversion might have taken place. So we fall through
// to the normal case.
if (errno != EINVAL && errno != E2BIG)
throw new java::io::CharConversionException ();
}
if (iconv_byte_swap)