Add null checking code after add_node 80/249680/1
authorlokilee73 <changjoo.lee@samsung.com>
Wed, 16 Dec 2020 06:39:24 +0000 (15:39 +0900)
committerlokilee73 <changjoo.lee@samsung.com>
Wed, 16 Dec 2020 06:39:34 +0000 (15:39 +0900)
Change-Id: Ia8a18630551d988e01a90e3158ba4d42b183b4f9
Signed-off-by: lokilee73 <changjoo.lee@samsung.com>
plugins/iot/display/core.c
plugins/mobile/display/core.c
plugins/tv/display/core.c

index b748d4a..e01f281 100644 (file)
@@ -1014,9 +1014,13 @@ static void proc_condition_lock(PMMsg *data)
        holdkey_block = GET_COND_FLAG(data->cond) & PM_FLAG_BLOCK_HOLDKEY;
 
        tmp = find_node(state, pid);
-       if (!tmp)
-               add_node(state, pid, cond_timeout_id, holdkey_block);
-       else {
+       if (!tmp) {
+               tmp = add_node(state, pid, cond_timeout_id, holdkey_block);
+               if (!tmp) {
+                       _E("Failed to acquire lock, state: %d, pid: %d.", state, pid);
+                       return;
+               }
+       } else {
                update_lock_timer(data, tmp, cond_timeout_id);
                tmp->holdkey_block = holdkey_block;
        }
index 98caba4..1c708b0 100644 (file)
@@ -1026,9 +1026,13 @@ static void proc_condition_lock(PMMsg *data)
        holdkey_block = GET_COND_FLAG(data->cond) & PM_FLAG_BLOCK_HOLDKEY;
 
        tmp = find_node(state, pid);
-       if (!tmp)
-               add_node(state, pid, cond_timeout_id, holdkey_block);
-       else {
+       if (!tmp) {
+               tmp = add_node(state, pid, cond_timeout_id, holdkey_block);
+               if (!tmp) {
+                       _E("Failed to acquire lock, state: %d, pid: %d.", state, pid);
+                       return;
+               }
+       } else {
                update_lock_timer(data, tmp, cond_timeout_id);
                tmp->holdkey_block = holdkey_block;
        }
index 9a3b157..aaa62db 100644 (file)
@@ -1015,9 +1015,13 @@ static void proc_condition_lock(PMMsg *data)
        holdkey_block = GET_COND_FLAG(data->cond) & PM_FLAG_BLOCK_HOLDKEY;
 
        tmp = find_node(state, pid);
-       if (!tmp)
-               add_node(state, pid, cond_timeout_id, holdkey_block);
-       else {
+       if (!tmp) {
+               tmp = add_node(state, pid, cond_timeout_id, holdkey_block);
+               if (!tmp) {
+                       _E("Failed to acquire lock, state: %d, pid: %d.", state, pid);
+                       return;
+               }
+       } else {
                update_lock_timer(data, tmp, cond_timeout_id);
                tmp->holdkey_block = holdkey_block;
        }