SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

logind: use ASSERT_PTR to validate result before use

Browse Source 
handle_action_lookup() in general can return NULL, but not
here as the handle is checked before, so add an assert.

CID#1529415
CID#1529416
This commit is contained in:
Luca Boccassi
2023-12-09 13:17:02 +00:00
parent fc9d7ddbac
commit 2343f6b11e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/login/logind-action.c
+2 -2
View File
@@ -169,7 +169,7 @@ HandleAction handle_action_sleep_select(HandleActionSleepMask mask) {
if (!FLAGS_SET(mask, a))
continue;
if (sleep_supported(handle_action_lookup(*i)->sleep_operation) > 0)
if (sleep_supported(ASSERT_PTR(handle_action_lookup(*i))->sleep_operation) > 0)
return *i;
}
@@ -213,7 +213,7 @@ static int handle_action_execute(
inhibit_what_to_string(m->delayed_action->inhibit_what),
handle_action_to_string(handle));
inhibit_operation = handle_action_lookup(handle)->inhibit_what;
inhibit_operation = ASSERT_PTR(handle_action_lookup(handle))->inhibit_what;
/* If the actual operation is inhibited, warn and fail */
if (inhibit_what_is_valid(inhibit_operation) &&