summaryrefslogtreecommitdiff
path: root/libjava/gnu/gcj/convert
diff options
context:
space:
mode:
authortromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>2000-10-05 21:32:09 +0000
committertromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>2000-10-05 21:32:09 +0000
commit3fdf0a02ca043cc722cd4800e7c77c8302e93abd (patch)
tree0e75e88b2abe83308c5b43aa2f6b201ae3a4e63c /libjava/gnu/gcj/convert
parentf39aafc51e1526b76a2db6c39d04a4ae57673fac (diff)
downloadgcc-3fdf0a02ca043cc722cd4800e7c77c8302e93abd.tar.gz
* 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
Diffstat (limited to 'libjava/gnu/gcj/convert')
-rw-r--r--libjava/gnu/gcj/convert/natIconv.cc6
1 files changed, 4 insertions, 2 deletions
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)