Fixed the wrong return value

Change-Id: I02868e046ced73de976c1b38978ae4e557a77b17
Signed-off-by: Hyojung Jo <hj903.jo@samsung.com>

diff --git a/src/layout/AppsBaseLayout.cpp b/src/layout/AppsBaseLayout.cpp
index 67feabc..15d814c 100644 (file)
--- a/src/layout/AppsBaseLayout.cpp
+++ b/src/layout/AppsBaseLayout.cpp
@@ -378,13 +378,16 @@ int CAppsBaseLayout::sm_CbAppList(pkgmgrinfo_appinfo_h handle, void *data) {
        CAppContent *get;
        int i = 0;
 
+       if (!m->eoTable)
+               return -1;
+
        if (pkgmgrinfo_appinfo_is_nodisplay(handle, &nodisplay) != PMINFO_R_OK)
-               return 0;
+               return -1;
 
        if (pkgmgrinfo_appinfo_get_appid(handle, &appid) != PMINFO_R_OK)
-               return 0;
+               return -1;
 
-       if (nodisplay || !m->eoTable || !appid)
+       if (nodisplay || !appid)
                return 0;
 
        while (str_excluded_app[i]) {
@@ -394,27 +397,27 @@ int CAppsBaseLayout::sm_CbAppList(pkgmgrinfo_appinfo_h handle, void *data) {
        }
 
        if (pkgmgrinfo_appinfo_get_pkgid(handle, &pkgid) != PMINFO_R_OK)
-               return 0;
+               return -1;
 
        if (pkgmgrinfo_appinfo_get_label(handle, &name) != PMINFO_R_OK)
-               return 0;
+               return -1;
 
        if (pkgmgrinfo_appinfo_get_icon(handle, &icon) != PMINFO_R_OK)
-               return 0;
+               return -1;
 
        if (pkgmgrinfo_pkginfo_get_usr_pkginfo(pkgid, getuid(), &pph)
                        != PMINFO_R_OK)
-               return 0;
+               return -1;
 
        if (pkgmgrinfo_pkginfo_get_version(pph, &version)
                        != PMINFO_R_OK) {
                pkgmgrinfo_pkginfo_destroy_pkginfo(pph);
-               return 0;
+               return -1;
        }
 
        if (!m->pAppContentCategory->BeginQuery()) {
                pkgmgrinfo_pkginfo_destroy_pkginfo(pph);
-               return 0;
+               return -1;
        }
 
        while (m->pAppContentCategory->MoveNext()) {
@@ -431,16 +434,20 @@ int CAppsBaseLayout::sm_CbAppList(pkgmgrinfo_appinfo_h handle, void *data) {
 
        if (!m->pAppContentCategory->EndQuery()) {
                pkgmgrinfo_pkginfo_destroy_pkginfo(pph);
-               return 0;
+               return -1;
        }
 
        ainfo = new CAppInfo;
        if (!ainfo) {
                pkgmgrinfo_pkginfo_destroy_pkginfo(pph);
-               return 0;
+               return -1;
        }
 
-       ainfo->Create();
+       if (!ainfo->Create()) {
+               delete ainfo;
+               pkgmgrinfo_pkginfo_destroy_pkginfo(pph);
+               return -1;
+       }
 
        if (appid)
                ainfo->SetAppid(appid);