shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-22 22:03:43 +03:00
Code

home: move the assert back to the intended place

Browse Source 
98d81cf974 moved the assertion at the beginning of home_dispatch_acquire(),
which is however before we even check for any ongoing operation, hence we
might hit it even in legitimate cases.

Let's move it back to after we check for any possibly ongoing operation, to
make it once again a safety check.

Follow-up to 98d81cf974.
Resolves: #22443 and #24036
This commit is contained in:
Frantisek Sumsal 2023-05-29 20:28:34 +02:00 committed by Yu Watanabe
parent 4a7a13b5a0
commit e4ab2db9df
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/home/homed-home.c
View File

@ -2681,8 +2681,6 @@ static int home_dispatch_acquire(Home *h, Operation *o) {
assert(o);
assert(o->type == OPERATION_ACQUIRE);
assert(!h->current_operation);
switch (home_get_state(h)) {
case HOME_UNFIXATED:
@ -2718,6 +2716,8 @@ static int home_dispatch_acquire(Home *h, Operation *o) {
return 0;
}
assert(!h->current_operation);
r = home_ratelimit(h, &error);
if (r >= 0)
r = call(h, o->secret, for_state, &error);