fix crash issue when exception occurs

Change-Id: I83c891518be387ba8e3e56e3b786b28127c6ab4b
Signed-off-by: Seongjun Yim <se201.yim@samsung.com>

diff --git a/src/FWeb_WebBookmarkImpl.cpp b/src/FWeb_WebBookmarkImpl.cpp
index ed88111..86ddead 100755 (executable)
--- a/src/FWeb_WebBookmarkImpl.cpp
+++ b/src/FWeb_WebBookmarkImpl.cpp
@@ -112,7 +112,7 @@ _WebBookmarkImpl::AddFolder(const String& title, RecordId parentId, RecordId& fo
        }
 
        int ret = favorites_bookmark_add(pTitle.get(), null, realParentId, 1, &folderId);
-       SysTryReturn(NID_WEB, ret == FAVORITES_ERROR_NONE, ConvertErrorCode(ret), ConvertErrorCode(ret), "[%s] Propagating.", ConvertErrorCode(ret));
+       SysTryReturn(NID_WEB, ret == FAVORITES_ERROR_NONE, ConvertErrorCode(ret), ConvertErrorCode(ret), "[%s] Propagating.", GetErrorMessage(ConvertErrorCode(ret)));
 
        return E_SUCCESS;
 }
@@ -134,7 +134,7 @@ _WebBookmarkImpl::AddBookmark(const String& title, const String& url, RecordId p
        }
        
        int ret = favorites_bookmark_add(pTitle.get(), pUrl.get(), realParentId, 0, &bookmarkId);
-       SysTryReturn(NID_WEB, ret == FAVORITES_ERROR_NONE, ConvertErrorCode(ret), ConvertErrorCode(ret), "[%s] Propagating.", ConvertErrorCode(ret));
+       SysTryReturn(NID_WEB, ret == FAVORITES_ERROR_NONE, ConvertErrorCode(ret), ConvertErrorCode(ret), "[%s] Propagating.", GetErrorMessage(ConvertErrorCode(ret)));
        
        return E_SUCCESS;
 }
@@ -143,7 +143,6 @@ _WebBookmarkImpl::AddBookmark(const String& title, const String& url, RecordId p
 result 
 _WebBookmarkImpl::SetFavicon(RecordId bookmarkId, const Bitmap& favicon)
 {
-       SysTryReturnResult(NID_WEB, favicon.GetWidth() == 16 && favicon.GetHeight() == 16, E_INVALID_DATA, "The size of a favicon must be 16 X 16");
        SysTryReturnResult(NID_WEB, favicon.GetPixelColorFormat() == BITMAP_PIXEL_FORMAT_ARGB8888, E_INVALID_DATA, "The pixel format of a favicon must be ARGB8888");
 
        result r = E_SUCCESS;
@@ -170,7 +169,7 @@ _WebBookmarkImpl::SetFavicon(RecordId bookmarkId, const Bitmap& favicon)
        SysTryReturn(NID_WEB, r == E_SUCCESS, r, r, "[%s] Propagating.", r);
 
        int ret = favorites_bookmark_set_favicon(bookmarkId, pIcon);
-       SysTryReturn(NID_WEB, ret == FAVORITES_ERROR_NONE, ConvertErrorCode(ret), ConvertErrorCode(ret), "[%s] Propagating.", ConvertErrorCode(ret));
+       SysTryReturn(NID_WEB, ret == FAVORITES_ERROR_NONE, ConvertErrorCode(ret), ConvertErrorCode(ret), "[%s] Propagating.", GetErrorMessage(ConvertErrorCode(ret)));
 
        return E_SUCCESS;
 }
@@ -198,7 +197,7 @@ _WebBookmarkImpl::GetRootFolderId(void) const
 {
        int folderId = 0;
        int ret = favorites_bookmark_get_root_folder_id(&folderId);
-       SysTryReturn(NID_WEB, ret == FAVORITES_ERROR_NONE, -1, ConvertErrorCode(ret), "[%s] Propagating.", ConvertErrorCode(ret));
+       SysTryReturn(NID_WEB, ret == FAVORITES_ERROR_NONE, -1, ConvertErrorCode(ret), "[%s] Propagating.", GetErrorMessage(ConvertErrorCode(ret)));
 
        return folderId;
 }
@@ -236,7 +235,7 @@ result
 _WebBookmarkImpl::RemoveAll(void)
 {
        int ret = favorites_bookmark_delete_all_bookmarks();
-       SysTryReturn(NID_WEB, ret == FAVORITES_ERROR_NONE, ConvertErrorCode(ret), ConvertErrorCode(ret), "[%s] Propagating.", ConvertErrorCode(ret));
+       SysTryReturn(NID_WEB, ret == FAVORITES_ERROR_NONE, ConvertErrorCode(ret), ConvertErrorCode(ret), "[%s] Propagating.", GetErrorMessage(ConvertErrorCode(ret)));
 
        return E_SUCCESS;
 }