diff options
author | Minje Ahn <minje.ahn@samsung.com> | 2017-03-17 10:35:32 +0900 |
---|---|---|
committer | Minje Ahn <minje.ahn@samsung.com> | 2017-03-17 10:35:32 +0900 |
commit | 79b7360d0bd4ee8bdff567b359fc4c86bd47d5cc (patch) | |
tree | ebf939550957467c0d2123babe30435a8ab20f8b | |
parent | dc16a7412180b8f0649bd02738162940a4f782a3 (diff) | |
download | media-content-79b7360d0bd4ee8bdff567b359fc4c86bd47d5cc.tar.gz media-content-79b7360d0bd4ee8bdff567b359fc4c86bd47d5cc.tar.bz2 media-content-79b7360d0bd4ee8bdff567b359fc4c86bd47d5cc.zip |
Add null checker for internal handlersubmit/tizen/20170317.042104
Change-Id: Ib60c493c8aa47687d9c176197f6974919031b794
Signed-off-by: Minje Ahn <minje.ahn@samsung.com>
-rwxr-xr-x | Tizen.Content.MediaContent/Tizen.Content.MediaContent/ContentDatabase.cs | 39 | ||||
-rwxr-xr-x | packaging/csapi-media-content.spec | 2 |
2 files changed, 26 insertions, 15 deletions
diff --git a/Tizen.Content.MediaContent/Tizen.Content.MediaContent/ContentDatabase.cs b/Tizen.Content.MediaContent/Tizen.Content.MediaContent/ContentDatabase.cs index 43f3d98..dcf341e 100755 --- a/Tizen.Content.MediaContent/Tizen.Content.MediaContent/ContentDatabase.cs +++ b/Tizen.Content.MediaContent/Tizen.Content.MediaContent/ContentDatabase.cs @@ -210,18 +210,23 @@ namespace Tizen.Content.MediaContent MediaContentValidator.ThrowIfError( Interop.Folder.GetFolderFromDb(id, out handle), "Failed to get information"); - result = new MediaFolder(handle); + if (handle != IntPtr.Zero)
+ {
+ result = new MediaFolder(handle);
+ return (T)result;
+ } - return (T)result; } else if (typeof(T) == typeof(Storage)) { MediaContentValidator.ThrowIfError( Interop.Storage.GetStorageInfoFromDb(id, out handle), "Failed to get information"); - result = new Storage(handle); - - return (T)result; + if (handle != IntPtr.Zero)
+ {
+ result = new Storage(handle);
+ return (T)result;
+ } } return null; @@ -245,27 +250,33 @@ namespace Tizen.Content.MediaContent MediaContentValidator.ThrowIfError( Interop.Playlist.GetPlaylistFromDb(id, out handle), "Failed to get information"); - result = new PlayList(handle); - - return (T)result; + if (handle != IntPtr.Zero)
+ {
+ result = new PlayList(handle);
+ return (T)result;
+ } } else if (typeof(T) == typeof(Album)) { MediaContentValidator.ThrowIfError( Interop.Group.MediaAlbumGetAlbumFromDb(id, out handle), "Failed to get information"); - result = new Album(handle); - - return (T)result; + if (handle != IntPtr.Zero)
+ {
+ result = new Album(handle);
+ return (T)result;
+ } } else if (typeof(T) == typeof(Tag)) { MediaContentValidator.ThrowIfError( Interop.Tag.GetTagFromDb(id, out handle), "Failed to get information"); - result = new Tag(handle); - - return (T)result; + if (handle != IntPtr.Zero)
+ {
+ result = new Tag(handle);
+ return (T)result;
+ } } return null; diff --git a/packaging/csapi-media-content.spec b/packaging/csapi-media-content.spec index 74088c5..3c958ca 100755 --- a/packaging/csapi-media-content.spec +++ b/packaging/csapi-media-content.spec @@ -1,6 +1,6 @@ Name: csapi-media-content Summary: Tizen Media Content API for C# -Version: 1.0.10 +Version: 1.0.11 Release: 1 Group: Development/Libraries License: Apache-2.0 |