procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

jni.cc (_Jv_JNI_GetStringUTFChars): Pass length of string to JvGetStringUTFRegion.

Browse source 
* jni.cc (_Jv_JNI_GetStringUTFChars): Pass length of string to
	JvGetStringUTFRegion.
	* java/lang/natPosixProcess.cc (new_string): Pass length of string
	to JvGetStringUTFRegion.
	* java/lang/natDouble.cc (parseDouble): Pass length of string to
	JvGetStringUTFRegion.
	* java/lang/natWin32Process.cc (startProcess): Pass length of
	string to JvGetStringUTFRegion.
	* java/lang/natClass.cc (forName): Pass length of string to
	JvGetStringUTFRegion.
	* gnu/gcj/runtime/natNameFinder.cc (getExternalLabel): Pass length
	of string to JvGetStringUTFRegion.
	* gnu/gcj/convert/natIconv.cc (init): Pass length of string to
	JvGetStringUTFRegion.
	* gnu/awt/gtk/natGtkLabelPeer.cc (setText): Pass length of string
	to JvGetStringUTFRegion.
	* gnu/awt/gtk/natGtkButtonPeer.cc (setLabel): Pass length of
	string to JvGetStringUTFRegion.

From-SVN: r73571
This commit is contained in:
Tom Tromey 2003-11-14 01:48:30 +00:00 • committed by Tom Tromey
parent a25d596a29
commit b86ca9a2dc
10 changed files with 36 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
libjava/ChangeLog
View file

@ -1,3 +1,24 @@
2003-11-13 Tom Tromey <tromey@redhat.com>
* jni.cc (_Jv_JNI_GetStringUTFChars): Pass length of string to
JvGetStringUTFRegion.
* java/lang/natPosixProcess.cc (new_string): Pass length of string
to JvGetStringUTFRegion.
* java/lang/natDouble.cc (parseDouble): Pass length of string to
JvGetStringUTFRegion.
* java/lang/natWin32Process.cc (startProcess): Pass length of
string to JvGetStringUTFRegion.
* java/lang/natClass.cc (forName): Pass length of string to
JvGetStringUTFRegion.
* gnu/gcj/runtime/natNameFinder.cc (getExternalLabel): Pass length
of string to JvGetStringUTFRegion.
* gnu/gcj/convert/natIconv.cc (init): Pass length of string to
JvGetStringUTFRegion.
* gnu/awt/gtk/natGtkLabelPeer.cc (setText): Pass length of string
to JvGetStringUTFRegion.
* gnu/awt/gtk/natGtkButtonPeer.cc (setLabel): Pass length of
string to JvGetStringUTFRegion.
2003-11-13 Mohan Embar <gnustuff@thisiscool.com>
* gnu/java/nio/natSelectorImplPosix.cc
@ -113,6 +134,7 @@
* java/net/URLStreamHandler.java (toExternalForm): Print port only
if host is printed too and port was really given to URL.
2003-11-10 Gary Benson <gbenson@redhat.com>
* java/sql/Timestamp.java (valueOf): Correctly handle

2
libjava/gnu/awt/gtk/natGtkButtonPeer.cc
View file

@ -19,7 +19,7 @@ gnu::awt::gtk::GtkButtonPeer::setLabel (java::lang::String *label)
// FIXME: this can allocate an unbounded amount. Should use heap
// even though it is slower.
if (label)
JvGetStringUTFRegion (label, 0, len, buf);
JvGetStringUTFRegion (label, 0, label->length(), buf);
buf[len] = '\0';
// The button child is a label.
GtkBin *bin = GTK_BIN (ptr);

2
libjava/gnu/awt/gtk/natGtkLabelPeer.cc
View file

@ -20,7 +20,7 @@ gnu::awt::gtk::GtkLabelPeer::setText (java::lang::String *text)
// even though it is slower.
char buf[len + 1];
if (text)
JvGetStringUTFRegion (text, 0, len, buf);
JvGetStringUTFRegion (text, 0, text->length(), buf);
buf[len] = '\0';
gtk_label_set_text (GTK_LABEL (ptr), buf);
}

4
libjava/gnu/gcj/convert/natIconv.cc
View file

@ -42,7 +42,7 @@ gnu::gcj::convert::Input_iconv::init (jstring encoding)
#ifdef HAVE_ICONV
jsize len = _Jv_GetStringUTFLength (encoding);
char buffer[len + 1];
_Jv_GetStringUTFRegion (encoding, 0, len, buffer);
_Jv_GetStringUTFRegion (encoding, 0, encoding->length(), buffer);
buffer[len] = '\0';
iconv_t h = iconv_open ("UCS-2", buffer);
@ -142,7 +142,7 @@ gnu::gcj::convert::Output_iconv::init (jstring encoding)
#ifdef HAVE_ICONV
jsize len = _Jv_GetStringUTFLength (encoding);
char buffer[len + 1];
_Jv_GetStringUTFRegion (encoding, 0, len, buffer);
_Jv_GetStringUTFRegion (encoding, 0, encoding->length(), buffer);
buffer[len] = '\0';
iconv_t h = iconv_open (buffer, "UCS-2");

4
libjava/gnu/gcj/runtime/natNameFinder.cc
View file

@ -1,6 +1,6 @@
// natNameFinder.cc - native helper methods for NameFinder.java
/* Copyright (C) 2002 Free Software Foundation, Inc
/* Copyright (C) 2002, 2003 Free Software Foundation, Inc
This file is part of libgcj.
@ -56,7 +56,7 @@ gnu::gcj::runtime::NameFinder::getExternalLabel (java::lang::String* name)
char *newName = (char *) JvMalloc (pfxLen + nameLen + 1);
*(newName + 0) = '\0';
strcpy (newName, LABEL_PREFIX);
JvGetStringUTFRegion (name, 0, nameLen, newName + pfxLen);
JvGetStringUTFRegion (name, 0, name->length(), newName + pfxLen);
*(newName + pfxLen + nameLen) = '\0';
return JvNewStringLatin1 (newName);
}

2
libjava/java/lang/natClass.cc
View file

@ -71,7 +71,7 @@ java::lang::Class::forName (jstring className, jboolean initialize,
jsize length = _Jv_GetStringUTFLength (className);
char buffer[length];
_Jv_GetStringUTFRegion (className, 0, length, buffer);
_Jv_GetStringUTFRegion (className, 0, className->length(), buffer);
_Jv_Utf8Const *name = _Jv_makeUtf8Const (buffer, length);

4
libjava/java/lang/natDouble.cc
View file

@ -1,6 +1,6 @@
// natDouble.cc - Implementation of java.lang.Double native methods.
/* Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation
/* Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software Foundation
This file is part of libgcj.
@ -183,7 +183,7 @@ java::lang::Double::parseDouble(jstring str)
{
// Note that UTF can expand 3x.
char *data = (char *) __builtin_alloca (3 * length + 1);
jsize blength = _Jv_GetStringUTFRegion (str, start, length, data);
jsize blength = _Jv_GetStringUTFRegion (str, start, str->length(), data);
data[blength] = 0;
struct _Jv_reent reent;

4
libjava/java/lang/natPosixProcess.cc
View file

@ -1,6 +1,6 @@
// natPosixProcess.cc - Native side of POSIX process code.
/* Copyright (C) 1998, 1999, 2000, 2002 Free Software Foundation
/* Copyright (C) 1998, 1999, 2000, 2002, 2003 Free Software Foundation
This file is part of libgcj.
@ -82,7 +82,7 @@ new_string (jstring string)
{
jsize s = _Jv_GetStringUTFLength (string);
char *buf = (char *) _Jv_Malloc (s + 1);
_Jv_GetStringUTFRegion (string, 0, s, buf);
_Jv_GetStringUTFRegion (string, 0, string->length(), buf);
buf[s] = '\0';
return buf;
}

4
libjava/java/lang/natWin32Process.cc
View file

@ -230,7 +230,7 @@ java::lang::ConcreteProcess::startProcess (jstringArray progarray,
if (i > 0)
*cmdLineCurPos++ = ' ';
jsize s = _Jv_GetStringUTFLength (elts[i]);
_Jv_GetStringUTFRegion (elts[i], 0, s, cmdLineCurPos);
_Jv_GetStringUTFRegion (elts[i], 0, elts[i]->length(), cmdLineCurPos);
cmdLineCurPos += s;
}
*cmdLineCurPos = '\0';
@ -251,7 +251,7 @@ java::lang::ConcreteProcess::startProcess (jstringArray progarray,
for (int i = 0; i < envp->length; ++i)
{
jsize s = _Jv_GetStringUTFLength (elts[i]);
_Jv_GetStringUTFRegion (elts[i], 0, s, (env + j));
_Jv_GetStringUTFRegion (elts[i], 0, elts[i]->length(), (env + j));
j += s;
*(env + j) = '\0';

2
libjava/jni.cc
View file

@ -1303,7 +1303,7 @@ static const char *
try
{
char *r = (char *) _Jv_Malloc (len + 1);
JvGetStringUTFRegion (string, 0, len, r);
JvGetStringUTFRegion (string, 0, string->length(), r);
r[len] = '\0';
if (isCopy)