[Bundle] Prevent null dereference and handle null array values

Signed-off-by: Sidharth Gupta <sid92.gupta@samsung.com>
Change-Id: I9d33e74b5d840d24885aa22eb17b4201d4b9e861

diff --git a/Tizen.Applications/Tizen.Applications/Bundle.cs b/Tizen.Applications/Tizen.Applications/Bundle.cs
old mode 100755 (executable)
new mode 100644 (file)
index acebd0b..793fe75
--- a/Tizen.Applications/Tizen.Applications/Bundle.cs
+++ b/Tizen.Applications/Tizen.Applications/Bundle.cs
@@ -271,7 +271,7 @@ namespace Tizen.Applications
         {
             if (!_keys.Contains(key))
             {
-                string[] valueArray = value.ToArray();
+                string[] valueArray = value.Select(v => v == null ? string.Empty : v).ToArray();
                 int ret = Interop.Bundle.AddStringArray(_handle, key, valueArray, valueArray.Count());
                 BundleErrorFactory.CheckAndThrowException(ret, _handle);
                 _keys.Add(key);
@@ -315,7 +315,10 @@ namespace Tizen.Applications
                         IntPtr stringPtr;
                         int retString = Interop.Bundle.GetString(_handle, key, out stringPtr);
                         BundleErrorFactory.CheckAndThrowException(retString, _handle);
-                        return Marshal.PtrToStringAuto(stringPtr);
+                        string stringValue = Marshal.PtrToStringAuto(stringPtr);
+                        if (stringValue == null)
+                            return string.Empty;
+                        return stringValue;
 
                     case (int)BundleType.StringArray:
                         // get string array