git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

re PR libgcj/49314 (md5test, shatest output FAILs on Tru64 UNIX) 

PR libgcj/49314
	* gnu/gcj/convert/natIconv.cc (iconv_init): Pad in[] with NUL byte.

From-SVN: r175266
This commit is contained in:
Rainer Orth 2011-06-21 17:09:57 +00:00 committed by Rainer Orth
parent 146aef0b39
commit 61d2c24233
2 changed files with 11 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 @@
2011-06-21 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
PR libgcj/49314
* gnu/gcj/convert/natIconv.cc (iconv_init): Pad in[] with NUL byte.
2011-06-17 Jack Howarth <howarth@bromo.med.uc.edu> 2011-06-17 Jack Howarth <howarth@bromo.med.uc.edu>
PR target/49461 PR target/49461

10
libjava/gnu/gcj/convert/natIconv.cc
View File

@ -1,6 +1,6 @@
// natIconv.cc -- Java side of iconv() reader. // natIconv.cc -- Java side of iconv() reader.
/* Copyright (C) 2000, 2001, 2003, 2006 Free Software Foundation /* Copyright (C) 2000, 2001, 2003, 2006, 2011 Free Software Foundation
This file is part of libgcj. This file is part of libgcj.
@ -264,17 +264,19 @@ gnu::gcj::convert::IOConverter::iconv_init (void)
if (handle != (iconv_t) -1) if (handle != (iconv_t) -1)
{ {
jchar c; jchar c;
unsigned char in[3]; unsigned char in[4];
char *inp, *outp; char *inp, *outp;
size_t inc, outc, r; size_t inc, outc, r;
// This is the UTF-8 encoding of \ufeff. // This is the UTF-8 encoding of \ufeff. At least Tru64 UNIX libiconv
// needs the trailing NUL byte, otherwise iconv fails with EINVAL.
in[0] = 0xef; in[0] = 0xef;
in[1] = 0xbb; in[1] = 0xbb;
in[2] = 0xbf; in[2] = 0xbf;
in[3] = 0x00;
inp = (char *) in; inp = (char *) in;
inc = 3; inc = 4;
outp = (char *) &c; outp = (char *) &c;
outc = 2; outc = 2;