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 099d7279533b6c315c36ffda67820cfec79e1424..ed630241938a28e68e461b5805a7f43409a8336b 100644 (file)
--- 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 78ab77ff81a8249f33331024f7279c868de5059a..060f1261fbae9ad868475114d372f2ec31ab5e22 100644 (file)
--- 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 53bda1f4c33ae04e8bb9ec53ee91cc6ecb9c2a88..88168e33ab7e2cae312262605ef186e79f59a571 100644 (file)
--- 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);