diff options
Diffstat (limited to 'libjava/java')
| -rw-r--r-- | libjava/java/lang/Boolean.java | 7 | ||||
| -rw-r--r-- | libjava/java/lang/natString.cc | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/libjava/java/lang/Boolean.java b/libjava/java/lang/Boolean.java index 78ab77f..060f126 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 53bda1f..88168e3 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); |