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: don't hit assert when we try to free NULL manager object
[elogind.git]
/
src
/
login
/
logind-device.c
diff --git
a/src/login/logind-device.c
b/src/login/logind-device.c
index c5fe92bd6044974d55cb17ed41d3062a542a1500..eb5edd1cd5e11d2ce8ef2731668a1e65701497ad 100644
(file)
--- a/
src/login/logind-device.c
+++ b/
src/login/logind-device.c
@@
-1,5
+1,3
@@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
/***
This file is part of systemd.
/***
This file is part of systemd.
@@
-19,11
+17,11
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include <assert.h>
#include <string.h>
#include <string.h>
-#include "util.h"
+#include "
alloc-
util.h"
#include "logind-device.h"
#include "logind-device.h"
+#include "util.h"
Device* device_new(Manager *m, const char *sysfs, bool master) {
Device *d;
Device* device_new(Manager *m, const char *sysfs, bool master) {
Device *d;
@@
-54,18
+52,7
@@
Device* device_new(Manager *m, const char *sysfs, bool master) {
return d;
}
return d;
}
-void device_free(Device *d) {
- assert(d);
-
- device_detach(d);
-
- hashmap_remove(d->manager->devices, d->sysfs);
-
- free(d->sysfs);
- free(d);
-}
-
-void device_detach(Device *d) {
+static void device_detach(Device *d) {
Seat *s;
SessionDevice *sd;
Seat *s;
SessionDevice *sd;
@@
-87,6
+74,17
@@
void device_detach(Device *d) {
}
}
}
}
+void device_free(Device *d) {
+ assert(d);
+
+ device_detach(d);
+
+ hashmap_remove(d->manager->devices, d->sysfs);
+
+ free(d->sysfs);
+ free(d);
+}
+
void device_attach(Device *d, Seat *s) {
Device *i;
bool had_master;
void device_attach(Device *d, Seat *s) {
Device *i;
bool had_master;