2 files changed, 18 insertions, 3 deletions
diff --git a/Tizen.Applications.DataControl/Tizen.Applications.DataControl/MatrixCursor.cs b/Tizen.Applications.DataControl/Tizen.Applications.DataControl/MatrixCursor.cs
index 685a554..c0d8047 100755
--- a/Tizen.Applications.DataControl/Tizen.Applications.DataControl/MatrixCursor.cs
+++ b/Tizen.Applications.DataControl/Tizen.Applications.DataControl/MatrixCursor.cs
@@ -260,6 +260,10 @@ namespace Tizen.Applications.DataControl
             }
 
             byte_array = GetValue(index);
+            if (byte_array == null)
+            {
+                ErrorFactory.ThrowException(ResultType.InvalidParamer, false);
+            }
             ret = BitConverter.ToInt32(byte_array, 0);
 
             return ret;
@@ -280,6 +284,10 @@ namespace Tizen.Applications.DataControl
             }
 
             byte_array = GetValue(index);
+            if (byte_array == null)
+            {
+                ErrorFactory.ThrowException(ResultType.InvalidParamer, false);
+            }
             ret = BitConverter.ToInt64(byte_array, 0);
 
             return ret;
@@ -300,6 +308,10 @@ namespace Tizen.Applications.DataControl
             }
 
             byte_array = GetValue(index);
+            if (byte_array == null)
+            {
+                ErrorFactory.ThrowException(ResultType.InvalidParamer, false);
+            }
             ret = BitConverter.ToDouble(byte_array, 0);
 
             return ret;
diff --git a/Tizen.Applications.DataControl/Tizen.Applications.DataControl/Provider.cs b/Tizen.Applications.DataControl/Tizen.Applications.DataControl/Provider.cs
index b2bc00c..699f522 100755
--- a/Tizen.Applications.DataControl/Tizen.Applications.DataControl/Provider.cs
+++ b/Tizen.Applications.DataControl/Tizen.Applications.DataControl/Provider.cs
@@ -119,7 +119,7 @@ namespace Tizen.Applications.DataControl
             {
                 query += " LIMIT " + countPerPage + " OFFSET " + (countPerPage * (pageNum - 1));
             }
-
+            handle.Dispose();
             return query;
         }
 
@@ -461,14 +461,15 @@ namespace Tizen.Applications.DataControl
                                 if (ret != ResultType.Success)
                                 {
                                     Log.Error(LogTag, "Writing a row to a file descriptor is failed");
+                                    mc.Dispose();
                                     return;
                                 }
                             }
                         }
                         while (write_size > 0);
+                        mc.Dispose();
                     }
 
-                    mc.Dispose();
                 }
                 else
                 {
@@ -806,6 +807,7 @@ namespace Tizen.Applications.DataControl
                 default:
                     break;
             }
+            handle.Dispose();
 
             return query;
         }
@@ -822,6 +824,7 @@ namespace Tizen.Applications.DataControl
                 provider = _providerDict[dataID];
                 provider._nativeHandle = handlePtr;
             }
+            handle.Dispose();
 
             return provider;
         }
@@ -839,7 +842,7 @@ namespace Tizen.Applications.DataControl
         {
             ResultType ret;
 
-            if (changedData == null | changedData.SafeBundleHandle.IsInvalid)
+            if (changedData == null || changedData.SafeBundleHandle.IsInvalid)
             {
                 ErrorFactory.ThrowException(ResultType.InvalidParamer, false, "changedData");
             }