chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
logind-session: Fix invalid free in the error case
[elogind.git]
/
src
/
login
/
logind-user.c
diff --git
a/src/login/logind-user.c
b/src/login/logind-user.c
index fdbf6e3aa08ef73df5e30a283932004e49e34b45..4af0e90c2232d36d9c790085151d5765166eb09f 100644
(file)
--- a/
src/login/logind-user.c
+++ b/
src/login/logind-user.c
@@
-494,13
+494,19
@@
static int user_remove_runtime_path(User *u) {
return r;
}
return r;
}
-int user_stop(User *u) {
+int user_stop(User *u
, bool force
) {
Session *s;
int r = 0, k;
assert(u);
Session *s;
int r = 0, k;
assert(u);
+ /* Stop jobs have already been queued */
+ if (u->stopping) {
+ user_save(u);
+ return r;
+ }
+
LIST_FOREACH(sessions_by_user, s, u->sessions) {
LIST_FOREACH(sessions_by_user, s, u->sessions) {
- k = session_stop(s);
+ k = session_stop(s
, force
);
if (k < 0)
r = k;
}
if (k < 0)
r = k;
}
@@
-648,9
+654,12
@@
UserState user_get_state(User *u) {
bool all_closing = true;
LIST_FOREACH(sessions_by_user, i, u->sessions) {
bool all_closing = true;
LIST_FOREACH(sessions_by_user, i, u->sessions) {
- if (session_is_active(i))
+ SessionState state;
+
+ state = session_get_state(i);
+ if (state == SESSION_ACTIVE)
return USER_ACTIVE;
return USER_ACTIVE;
- if (s
ession_get_state(i)
!= SESSION_CLOSING)
+ if (s
tate
!= SESSION_CLOSING)
all_closing = false;
}
all_closing = false;
}