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

re PR libgcj/35979 (JNI method NewStringUTF throws NPE when passed a NULL pointer)

Browse source 
PR libgcj/35979:
	* jni.cc (_Jv_JNI_NewStringUTF): Return NULL if bytes==NULL.

From-SVN: r134471
This commit is contained in:
Tom Tromey 2008-04-19 21:35:02 +00:00 • committed by Tom Tromey
parent 766cb6619b
commit 476924c9e0
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libjava/ChangeLog
View file

@ -1,3 +1,8 @@
2008-04-19 Tom Tromey <tromey@redhat.com>
PR libgcj/35979:
* jni.cc (_Jv_JNI_NewStringUTF): Return NULL if bytes==NULL.
2008-04-18 Paolo Bonzini <bonzini@gnu.org> 2008-04-18 Paolo Bonzini <bonzini@gnu.org>
PR bootstrap/35457 PR bootstrap/35457

5
libjava/jni.cc
View file

@ -1,6 +1,6 @@
// jni.cc - JNI implementation, including the jump table. // jni.cc - JNI implementation, including the jump table.
/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 /* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
Free Software Foundation Free Software Foundation
This file is part of libgcj. This file is part of libgcj.
@ -1332,6 +1332,9 @@ _Jv_JNI_NewStringUTF (JNIEnv *env, const char *bytes)
{ {
try try
{ {
// For compatibility with the JDK.
if (!bytes)
return NULL;
jstring result = JvNewStringUTF (bytes); jstring result = JvNewStringUTF (bytes);
return (jstring) wrap_value (env, result); return (jstring) wrap_value (env, result);
} }