From 3fdf0a02ca043cc722cd4800e7c77c8302e93abd Mon Sep 17 00:00:00 2001 From: tromey Date: Thu, 5 Oct 2000 21:32:09 +0000 Subject: * gnu/gcj/convert/natIconv.cc (init): Terminate buffer. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@36733 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/ChangeLog | 4 ++++ libjava/gnu/gcj/convert/natIconv.cc | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'libjava') diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 80185b844fb..d568149475e 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,7 @@ +2000-10-05 Tom Tromey + + * gnu/gcj/convert/natIconv.cc (init): Terminate buffer. + 2000-10-02 Bryce McKinlay * prims.cc (_Jv_argv, _Jv_argc): New fields. diff --git a/libjava/gnu/gcj/convert/natIconv.cc b/libjava/gnu/gcj/convert/natIconv.cc index fe79dc12515..061779c02b8 100644 --- a/libjava/gnu/gcj/convert/natIconv.cc +++ b/libjava/gnu/gcj/convert/natIconv.cc @@ -38,8 +38,9 @@ gnu::gcj::convert::Input_iconv::init (jstring encoding) { #ifdef HAVE_ICONV jsize len = _Jv_GetStringUTFLength (encoding); - char buffer[len]; + char buffer[len + 1]; _Jv_GetStringUTFRegion (encoding, 0, len, buffer); + buffer[len] = '\0'; iconv_t h = iconv_open ("UCS-2", buffer); if (h == (iconv_t) -1) @@ -97,8 +98,9 @@ gnu::gcj::convert::Output_iconv::init (jstring encoding) { #ifdef HAVE_ICONV jsize len = _Jv_GetStringUTFLength (encoding); - char buffer[len]; + char buffer[len + 1]; _Jv_GetStringUTFRegion (encoding, 0, len, buffer); + buffer[len] = '\0'; iconv_t h = iconv_open (buffer, "UCS-2"); if (h == (iconv_t) -1) -- cgit v1.2.3