From 369e1d74c6c3ffc4acb1c6c3defabd9ba19401b9 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 15 Aug 2001 20:24:00 +0000 Subject: [PATCH] natIconv.cc (read): Handle EINVAL and E2BIG correctly. * gnu/gcj/convert/natIconv.cc (read): Handle EINVAL and E2BIG correctly. From-SVN: r44928 --- libjava/ChangeLog | 5 +++++ libjava/gnu/gcj/convert/natIconv.cc | 11 +++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index c9e66060d13..81acaa9e455 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2001-08-15 Tom Tromey + + * gnu/gcj/convert/natIconv.cc (read): Handle EINVAL and E2BIG + correctly. + 2001-08-09 Tom Tromey * java/awt/image/SampleModel.java (getPixel): Set correct array 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) -- 2.30.2