Fix Svace issue of FORWARD_NULL and CHECKED_RETURN

Change-Id: I438c64695588a21a8f442201254b8bac4b2f4708

diff --git a/packaging/mm-resource-manager.spec b/packaging/mm-resource-manager.spec
index 173bb0a..300c34b 100644 (file)
--- a/packaging/mm-resource-manager.spec
+++ b/packaging/mm-resource-manager.spec
@@ -1,6 +1,6 @@
 Name:       mm-resource-manager
 Summary:    A Multimedia Resource Manager API
-Version:    0.2.32
+Version:    0.2.33
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/daemon/mm_resource_manager_daemon_priv.c b/src/daemon/mm_resource_manager_daemon_priv.c
index f3e4d56..968fca0 100644 (file)
--- a/src/daemon/mm_resource_manager_daemon_priv.c
+++ b/src/daemon/mm_resource_manager_daemon_priv.c
@@ -625,7 +625,8 @@ static GArray *__handle_acquire_requests(mm_resource_manager_dmn_p manager,
                }
                manager->resources[type]->state = MM_RESOURCE_MANAGER_RES_STATE_ACQUIRED;
                mm_resource_manager_backend_acquire(type);
-               MM_RM_DEBUG("RM #%"PRIu64" (type %s mgr %p) is acquired", _mm_rm_hash64(i_mgr->id), res_name, i_mgr);
+               if (i_mgr)
+                       MM_RM_DEBUG("RM #%"PRIu64" (type %s mgr %p) is acquired", _mm_rm_hash64(i_mgr->id), res_name, i_mgr);
        }
 
        return cb_requests;

diff --git a/src/lib/mm_resource_manager_priv.c b/src/lib/mm_resource_manager_priv.c
index d1832fc..3115dbb 100644 (file)
--- a/src/lib/mm_resource_manager_priv.c
+++ b/src/lib/mm_resource_manager_priv.c
@@ -918,8 +918,10 @@ static int __dbus_commit(mm_resource_manager_s *handle)
                for (i = 0; i < handle->resources->len; i++) {
                        resource = (mm_resource_manager_res_p) handle->resources->pdata[i];
 
-                       if (resource->state == MM_RESOURCE_MANAGER_RES_STATE_FOR_ACQUIRE)
-                               g_variant_iter_next(&flags_iter, "b", &resource->is_acquire_failed);
+                       if (resource->state == MM_RESOURCE_MANAGER_RES_STATE_FOR_ACQUIRE) {
+                               if (!g_variant_iter_next(&flags_iter, "b", &resource->is_acquire_failed))
+                                       MM_RM_ERROR("g_variant_iter_next failed to get the value of is_acquire_failed");
+                       }
                }
        }