Fix hal shutdown crash.
Removing the device invalidates its ->next pointer. Copy it aside before destroying the device.
This commit is contained in:
parent
99e4531f7c
commit
f52f6c5c7e
|
@ -74,7 +74,7 @@ remove_device(DeviceIntPtr dev)
|
||||||
static void
|
static void
|
||||||
device_removed(LibHalContext *ctx, const char *udi)
|
device_removed(LibHalContext *ctx, const char *udi)
|
||||||
{
|
{
|
||||||
DeviceIntPtr dev;
|
DeviceIntPtr dev, next;
|
||||||
char *value;
|
char *value;
|
||||||
|
|
||||||
value = xalloc(strlen(udi) + 5); /* "hal:" + NULL */
|
value = xalloc(strlen(udi) + 5); /* "hal:" + NULL */
|
||||||
|
@ -82,11 +82,13 @@ device_removed(LibHalContext *ctx, const char *udi)
|
||||||
return;
|
return;
|
||||||
sprintf(value, "hal:%s", udi);
|
sprintf(value, "hal:%s", udi);
|
||||||
|
|
||||||
for (dev = inputInfo.devices; dev; dev = dev->next) {
|
for (dev = inputInfo.devices; dev; dev = next) {
|
||||||
|
next = dev->next;
|
||||||
if (dev->config_info && strcmp(dev->config_info, value) == 0)
|
if (dev->config_info && strcmp(dev->config_info, value) == 0)
|
||||||
remove_device(dev);
|
remove_device(dev);
|
||||||
}
|
}
|
||||||
for (dev = inputInfo.off_devices; dev; dev = dev->next) {
|
for (dev = inputInfo.off_devices; dev; dev = next) {
|
||||||
|
next = dev->next;
|
||||||
if (dev->config_info && strcmp(dev->config_info, value) == 0)
|
if (dev->config_info && strcmp(dev->config_info, value) == 0)
|
||||||
remove_device(dev);
|
remove_device(dev);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user