From 35a80a1e437c4c164cb52a3302ac88679090734e Mon Sep 17 00:00:00 2001
From: Jerome St-Louis <jerome@ecere.com>
Date: Tue, 17 Nov 2015 00:04:23 -0500
Subject: [PATCH] com/containers; dataTypes: Null checks - Support for
 returning non-capitalized enum strings if OnGetString()'s tempString
 parameter is null

---
 ecere/src/com/containers/Container.ec |  2 +-
 ecere/src/com/containers/Map.ec       |  2 +-
 ecere/src/com/dataTypes.ec            | 14 +++++++++-----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ecere/src/com/containers/Container.ec b/ecere/src/com/containers/Container.ec
index 532758d..d357a5f 100644
--- a/ecere/src/com/containers/Container.ec
+++ b/ecere/src/com/containers/Container.ec
@@ -102,7 +102,7 @@ public class Container<class T, class I = int, class D = T>
 {
 public:
    class_fixed
-   public property Container<T> copySrc { set { Copy(value); } }
+   public property Container<T> copySrc { set { if(value) Copy(value); } }
    property Iterator<T> firstIterator { get { value = { (Container<T>)this, pointer = GetFirst() }; } }
    property Iterator<T> lastIterator  { get { value = { (Container<T>)this, pointer = GetLast() }; } }
 
diff --git a/ecere/src/com/containers/Map.ec b/ecere/src/com/containers/Map.ec
index 4d5d19e..2c21008 100644
--- a/ecere/src/com/containers/Map.ec
+++ b/ecere/src/com/containers/Map.ec
@@ -237,7 +237,7 @@ public class Map<class MT, class V> : CustomAVLTree<MapNode<MT, V>, I = MT, D =
       {
          IteratorPointer i;
          RemoveAll();
-         if(eClass_IsDerived(value._class, class(Map)))
+         if(value && eClass_IsDerived(value._class, class(Map)))
          {
             for(i = value.GetFirst(); i; i = value.GetNext(i))
             {
diff --git a/ecere/src/com/dataTypes.ec b/ecere/src/com/dataTypes.ec
index 644c40f..0e2ebb3 100644
--- a/ecere/src/com/dataTypes.ec
+++ b/ecere/src/com/dataTypes.ec
@@ -222,11 +222,15 @@ public:
    }
    if(item)
    {
-      strcpy(tempString, item.name);
-      if(!needClass || !*needClass)
-         tempString[0] = (char)toupper(tempString[0]);
-      return tempString;
-      //return item.name;
+      if(tempString)
+      {
+         strcpy(tempString, item.name);
+         if(!needClass || !*needClass)
+            tempString[0] = (char)toupper(tempString[0]);
+         return tempString;
+      }
+      else
+         return item.name;
    }
    else
       return null;
-- 
1.8.3.1