depau/libfprint
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

virtual-device: Properly cleanup the virtual devices data

Browse source 
Ensure we call the parent finalize function and cleanup local data
This commit is contained in:
Marco Trevisan (Treviño) 2021-01-24 02:03:20 +01:00
parent e8886dbc6b
commit a291d17f26
2 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
libfprint/drivers/virtual-device-storage.c
View file

@ -167,6 +167,16 @@ fpi_device_virtual_device_storage_init (FpDeviceVirtualDeviceStorage *self)
NULL); NULL);
} }
static void
fpi_device_virtual_device_storage_finalize (GObject *object)
{
FpDeviceVirtualDevice *vdev = FP_DEVICE_VIRTUAL_DEVICE (object);
G_DEBUG_HERE ();
g_clear_pointer (&vdev->prints_storage, g_hash_table_destroy);
G_OBJECT_CLASS (fpi_device_virtual_device_storage_parent_class)->finalize (object);
}
static const FpIdEntry driver_ids[] = { static const FpIdEntry driver_ids[] = {
{ .virtual_envvar = "FP_VIRTUAL_DEVICE_STORAGE" }, { .virtual_envvar = "FP_VIRTUAL_DEVICE_STORAGE" },
{ .virtual_envvar = "FP_VIRTUAL_DEVICE_IDENT" }, { .virtual_envvar = "FP_VIRTUAL_DEVICE_IDENT" },
@ -177,6 +187,9 @@ static void
fpi_device_virtual_device_storage_class_init (FpDeviceVirtualDeviceStorageClass *klass) fpi_device_virtual_device_storage_class_init (FpDeviceVirtualDeviceStorageClass *klass)
{ {
FpDeviceClass *dev_class = FP_DEVICE_CLASS (klass); FpDeviceClass *dev_class = FP_DEVICE_CLASS (klass);
GObjectClass *object_class = G_OBJECT_CLASS (klass);
object_class->finalize = fpi_device_virtual_device_storage_finalize;
dev_class->id = FP_COMPONENT; dev_class->id = FP_COMPONENT;
dev_class->full_name = "Virtual device with storage and identification for debugging"; dev_class->full_name = "Virtual device with storage and identification for debugging";

4
libfprint/drivers/virtual-device.c
View file

@ -419,7 +419,11 @@ dev_deinit (FpDevice *dev)
static void static void
fpi_device_virtual_device_finalize (GObject *object) fpi_device_virtual_device_finalize (GObject *object)
{ {
FpDeviceVirtualDevice *self = FP_DEVICE_VIRTUAL_DEVICE (object);
G_DEBUG_HERE (); G_DEBUG_HERE ();
g_clear_pointer (&self->pending_commands, g_ptr_array_unref);
G_OBJECT_CLASS (fpi_device_virtual_device_parent_class)->finalize (object);
} }
static void static void