From 476924c9e097b4d5f0179c2835bb34d288f92561 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sat, 19 Apr 2008 21:35:02 +0000 Subject: [PATCH] re PR libgcj/35979 (JNI method NewStringUTF throws NPE when passed a NULL pointer) PR libgcj/35979: * jni.cc (_Jv_JNI_NewStringUTF): Return NULL if bytes==NULL. From-SVN: r134471 --- libjava/ChangeLog | 5 +++++ libjava/jni.cc | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 7f501bd04c4..c639181c878 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2008-04-19 Tom Tromey + + PR libgcj/35979: + * jni.cc (_Jv_JNI_NewStringUTF): Return NULL if bytes==NULL. + 2008-04-18 Paolo Bonzini PR bootstrap/35457 diff --git a/libjava/jni.cc b/libjava/jni.cc index 8bb2e591881..220046187b4 100644 --- a/libjava/jni.cc +++ b/libjava/jni.cc @@ -1,6 +1,6 @@ // 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 This file is part of libgcj. @@ -1332,6 +1332,9 @@ _Jv_JNI_NewStringUTF (JNIEnv *env, const char *bytes) { try { + // For compatibility with the JDK. + if (!bytes) + return NULL; jstring result = JvNewStringUTF (bytes); return (jstring) wrap_value (env, result); } -- 2.30.2