Fix Static Analyzer issue

 - Add to check null pointer dereferenced

Fix build warning in Visual Studio
 - Remove duplicated using namespace

Change-Id: I99177aa9f043a64b5d507b321cccdb033a35079d
Signed-off-by: Jiyong Min <jiyong.min@samsung.com>

diff --git a/packaging/csapi-media-content.spec b/packaging/csapi-media-content.spec
index 0ad92ab..bd3c16a 100755 (executable)
--- a/packaging/csapi-media-content.spec
+++ b/packaging/csapi-media-content.spec
@@ -8,7 +8,7 @@
 
 Name:       csapi-media-content
 Summary:    Tizen Media Content API for C#
-Version:    1.0.2
+Version:    1.0.3
 Release:    1
 Group:      Development/Libraries
 License:    Apache-2.0

diff --git a/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/ContentDatabase.cs b/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/ContentDatabase.cs
index 17409f2..96afa30 100755 (executable)
--- a/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/ContentDatabase.cs
+++ b/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/ContentDatabase.cs
@@ -18,7 +18,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Threading;
 using System.Threading.Tasks;
 /// <summary>
 /// The Media Content API provides functions, enumerations used in the entire Content Service.
@@ -228,7 +227,7 @@ namespace Tizen.Content.MediaContent
                     result = new Storage(handle);
                 }
             }
-            return (T)result;
+            return (result != null) ? (T)result : null;
         }
 
 
@@ -277,7 +276,7 @@ namespace Tizen.Content.MediaContent
                 if (_handle != IntPtr.Zero)
                     contentCollection = new Tag(_handle);
             }
-            return (T)contentCollection;
+            return (contentCollection != null) ? (T)contentCollection : null;
         }
 
         private static List<MediaFolder> ForEachFolder(ContentFilter filter)
@@ -369,6 +368,11 @@ namespace Tizen.Content.MediaContent
             {
                 IntPtr newHandle;
                 res = (MediaContentError)Interop.Storage.Clone(out newHandle, storageHandle);
+                if (res != MediaContentError.None)
+                {
+                    Log.Warn(Globals.LogTag, "Failed to clone storage handle");
+                    throw MediaContentErrorFactory.CreateException(res, "Failed to clone storage handle");
+                }
                 storageCollections.Add(new Storage(newHandle));
                 return true;
             };
@@ -701,7 +705,7 @@ namespace Tizen.Content.MediaContent
         internal void Update(MediaFace face)
         {
             ConnectToDB();
-            Type type = face.GetType();
+
             MediaContentError result = (MediaContentError)Interop.Face.UpdateToDb(face.Handle);
             if (result != MediaContentError.None)
                 throw MediaContentErrorFactory.CreateException(result, "Failed to update DB");