From 489086774f3272fcd3468b0b10b82fd2b969578a Mon Sep 17 00:00:00 2001 From: tromey Date: Wed, 15 Aug 2001 20:24:00 +0000 Subject: * gnu/gcj/convert/natIconv.cc (read): Handle EINVAL and E2BIG correctly. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@44928 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/gnu/gcj/convert/natIconv.cc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'libjava/gnu') diff --git a/libjava/gnu/gcj/convert/natIconv.cc b/libjava/gnu/gcj/convert/natIconv.cc index 03fad96f1f3..3c10c8ace61 100644 --- a/libjava/gnu/gcj/convert/natIconv.cc +++ b/libjava/gnu/gcj/convert/natIconv.cc @@ -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) -- cgit v1.2.3