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

aes3k: Fix transfer error path and cancellable lifetime

Browse source 
The cancellable needs to be free'ed at deactivation. Also free it if we
run into a fatal error, which then in turn indicates that the device is
deactivated already.
This commit is contained in:
Benjamin Berg 2020-09-28 19:13:32 +02:00
parent 3ce6a15547
commit 8c4ff253cb
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
libfprint/drivers/aes3k.c
View file

@ -76,6 +76,7 @@ img_cb (FpiUsbTransfer *transfer, FpDevice *device,
{ {
FpImageDevice *dev = FP_IMAGE_DEVICE (device); FpImageDevice *dev = FP_IMAGE_DEVICE (device);
FpiDeviceAes3k *self = FPI_DEVICE_AES3K (device); FpiDeviceAes3k *self = FPI_DEVICE_AES3K (device);
FpiDeviceAes3kPrivate *priv = fpi_device_aes3k_get_instance_private (self);
FpiDeviceAes3kClass *cls = FPI_DEVICE_AES3K_GET_CLASS (self); FpiDeviceAes3kClass *cls = FPI_DEVICE_AES3K_GET_CLASS (self);
unsigned char *ptr = transfer->buffer; unsigned char *ptr = transfer->buffer;
FpImage *tmp; FpImage *tmp;
@ -90,11 +91,14 @@ img_cb (FpiUsbTransfer *transfer, FpDevice *device,
{ {
/* Cancellation implies we are deactivating. */ /* Cancellation implies we are deactivating. */
g_error_free (error); g_error_free (error);
g_clear_object (&priv->img_trf_cancel);
fpi_image_device_deactivate_complete (dev, NULL); fpi_image_device_deactivate_complete (dev, NULL);
return; return;
} }
fpi_image_device_session_error (dev, error); fpi_image_device_session_error (dev, error);
g_clear_object (&priv->img_trf_cancel);
return;
} }
fpi_image_device_report_finger_status (dev, TRUE); fpi_image_device_report_finger_status (dev, TRUE);
@ -144,9 +148,14 @@ do_capture (FpImageDevice *dev)
static void static void
init_reqs_cb (FpImageDevice *dev, GError *result, void *user_data) init_reqs_cb (FpImageDevice *dev, GError *result, void *user_data)
{ {
FpiDeviceAes3kPrivate *priv = fpi_device_aes3k_get_instance_private (FPI_DEVICE_AES3K (dev));
fpi_image_device_activate_complete (dev, result); fpi_image_device_activate_complete (dev, result);
if (!result) if (!result)
do_capture (dev); {
priv->img_trf_cancel = g_cancellable_new ();
do_capture (dev);
}
} }
static void static void
@ -157,7 +166,6 @@ aes3k_dev_activate (FpImageDevice *dev)
FpiDeviceAes3kClass *cls = FPI_DEVICE_AES3K_GET_CLASS (self); FpiDeviceAes3kClass *cls = FPI_DEVICE_AES3K_GET_CLASS (self);
g_assert (!priv->img_trf_cancel); g_assert (!priv->img_trf_cancel);
priv->img_trf_cancel = g_cancellable_new ();
aes_write_regv (dev, cls->init_reqs, cls->init_reqs_len, init_reqs_cb, NULL); aes_write_regv (dev, cls->init_reqs, cls->init_reqs_len, init_reqs_cb, NULL);
} }
@ -167,8 +175,11 @@ aes3k_dev_deactivate (FpImageDevice *dev)
FpiDeviceAes3k *self = FPI_DEVICE_AES3K (dev); FpiDeviceAes3k *self = FPI_DEVICE_AES3K (dev);
FpiDeviceAes3kPrivate *priv = fpi_device_aes3k_get_instance_private (self); FpiDeviceAes3kPrivate *priv = fpi_device_aes3k_get_instance_private (self);
/* Deactivation always finishes from the cancellation handler */ /* Deactivation finishes from the cancellation handler */
g_cancellable_cancel (priv->img_trf_cancel); if (priv->img_trf_cancel)
g_cancellable_cancel (priv->img_trf_cancel);
else
fpi_image_device_deactivate_complete (dev, NULL);
} }
static void static void