From: Bryce McKinlay <bryce@albatross.co.nz>
Date: Thu, 2 Dec 1999 19:59:30 +0000 (+0000)
Subject: natString.cc (equalsIgnoreCase): return false if anotherString is null.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=aa620e429476609d468be40383a7603d2b9c6547;p=gcc.git

natString.cc (equalsIgnoreCase): return false if anotherString is null.

        * java/lang/natString.cc (equalsIgnoreCase): return false if
        anotherString is null.
        * java/lang/Boolean.java (valueOf): return FALSE if argument is
        null.

From-SVN: r30763
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 099d7279533..ed630241938 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,7 +1,11 @@
 1999-12-02  Bryce McKinlay  <bryce@albatross.co.nz>
 
-	* libjava/java/net/ServerSocket.java (ServerSocket): Bind to any
-	interface if bindAddr is null.
+	* java/net/ServerSocket.java (ServerSocket): Bind to any interface 
+	if bindAddr is null.
+	* java/lang/natString.cc (equalsIgnoreCase): return false if
+	anotherString is null.
+	* java/lang/Boolean.java (valueOf): return FALSE if argument is
+	null.
 
 1999-11-30  Tom Tromey  <tromey@cygnus.com>
 
diff --git a/libjava/java/lang/Boolean.java b/libjava/java/lang/Boolean.java
index 78ab77ff81a..060f1261fba 100644
--- a/libjava/java/lang/Boolean.java
+++ b/libjava/java/lang/Boolean.java
@@ -89,7 +89,10 @@ public final class Boolean extends Object implements Serializable
 
   public static Boolean valueOf(String str)
   {
-    /* This returns a Boolean (big B), not a boolean (little b). */
-    return str.equalsIgnoreCase("true") ? TRUE : FALSE;
+    if (str == null)
+      return FALSE;
+    else
+      /* This returns a Boolean (big B), not a boolean (little b). */
+      return str.equalsIgnoreCase("true") ? TRUE : FALSE;
   }
 }
diff --git a/libjava/java/lang/natString.cc b/libjava/java/lang/natString.cc
index 53bda1f4c33..88168e33ab7 100644
--- a/libjava/java/lang/natString.cc
+++ b/libjava/java/lang/natString.cc
@@ -524,7 +524,7 @@ java::lang::String::toCharArray()
 jboolean
 java::lang::String::equalsIgnoreCase (jstring anotherString)
 {
-  if (count != anotherString->count)
+  if (anotherString == NULL || count != anotherString->count)
     return false;
   register jchar *tptr = JvGetStringChars (this);
   register jchar *optr = JvGetStringChars (anotherString);