Be more gently with NULL values

1 files changed, 7 insertions, 0 deletions

diff --git a/src/core/basetypes/MCHashMap.cpp b/src/core/basetypes/MCHashMap.cpp
index 9958c502..940515bc 100644
--- a/src/core/basetypes/MCHashMap.cpp
+++ b/src/core/basetypes/MCHashMap.cpp
@@ -203,6 +203,10 @@ Object * HashMap::objectForKey(Object * key)
 {
     unsigned int func;
     HashMapIter * iter;
+
+    if (key == NULL) {
+        return NULL;
+    }
     
     func = key->hash();
     
@@ -289,6 +293,9 @@ void HashMap::removeAllObjects()
 bool HashMap::isEqual(Object * otherObject)
 {
     HashMap * otherMap = (HashMap *) otherObject;
+    if (otherMap == NULL) {
+        return false;
+    }
     if (otherMap->count() != count()) {
         return false;
     }