mirrors/libfprint
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libfprint/libfprint.git synced 2026-09-10 21:06:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

realtek: Handle missing missing or invalid templates as errors

Browse Source
This commit is contained in:
Marco Trevisan (Treviño)
2026-07-13 08:13:46 +00:00
committed by Marco Trevisan
parent 2a4e68d64a
commit 0a446df6f9
1 changed files with 36 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libfprint/drivers/realtek/realtek.c
+36 -4
View File
@@ -978,7 +978,13 @@ fp_verify_sm_run_state (FpiSsm *ssm, FpDevice *device)
switch (fpi_ssm_get_cur_state (ssm)) switch (fpi_ssm_get_cur_state (ssm))
{ {
case FP_RTK_VERIFY_GET_TEMPLATE: case FP_RTK_VERIFY_GET_TEMPLATE:
g_assert (self->template_num > 0); if (self->template_num <= 0)
{
fpi_ssm_mark_failed (ssm,
fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
"No templates enrolled"));
break;
}
co_get_template.data_len[0] = GET_LEN_L (self->template_len * self->template_num); co_get_template.data_len[0] = GET_LEN_L (self->template_len * self->template_num);
co_get_template.data_len[1] = GET_LEN_H (self->template_len * self->template_num); co_get_template.data_len[1] = GET_LEN_H (self->template_len * self->template_num);
@@ -1040,7 +1046,13 @@ fp_enroll_sm_run_state (FpiSsm *ssm, FpDevice *device)
switch (fpi_ssm_get_cur_state (ssm)) switch (fpi_ssm_get_cur_state (ssm))
{ {
case FP_RTK_ENROLL_GET_TEMPLATE: case FP_RTK_ENROLL_GET_TEMPLATE:
g_assert (self->template_num > 0); if (self->template_num <= 0)
{
fpi_ssm_mark_failed (ssm,
fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
"No templates enrolled"));
break;
}
co_get_template.data_len[0] = GET_LEN_L (self->template_len * self->template_num); co_get_template.data_len[0] = GET_LEN_L (self->template_len * self->template_num);
co_get_template.data_len[1] = GET_LEN_H (self->template_len * self->template_num); co_get_template.data_len[1] = GET_LEN_H (self->template_len * self->template_num);
@@ -1160,7 +1172,13 @@ fp_delete_sm_run_state (FpiSsm *ssm, FpDevice *device)
switch (fpi_ssm_get_cur_state (ssm)) switch (fpi_ssm_get_cur_state (ssm))
{ {
case FP_RTK_DELETE_GET_POS: case FP_RTK_DELETE_GET_POS:
g_assert (self->template_num > 0); if (self->template_num <= 0)
{
fpi_ssm_mark_failed (ssm,
fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
"No templates enrolled"));
break;
}
co_get_template.data_len[0] = GET_LEN_L (self->template_len * self->template_num); co_get_template.data_len[0] = GET_LEN_L (self->template_len * self->template_num);
co_get_template.data_len[1] = GET_LEN_H (self->template_len * self->template_num); co_get_template.data_len[1] = GET_LEN_H (self->template_len * self->template_num);
@@ -1352,7 +1370,21 @@ list_print (FpDevice *device)
guint8 *cmd_buf = NULL; guint8 *cmd_buf = NULL;
G_DEBUG_HERE (); G_DEBUG_HERE ();
g_assert (self->template_num > 0);
if (self->template_num < 0)
{
fpi_device_list_complete (device, NULL,
fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO,
"Get template number failed!"));
return;
}
if (self->template_num == 0)
{
g_autoptr(GPtrArray) list_result = g_ptr_array_new_with_free_func (g_object_unref);
fpi_device_list_complete (device, g_steal_pointer (&list_result), NULL);
return;
}
co_get_template.data_len[0] = GET_LEN_L (self->template_len * self->template_num); co_get_template.data_len[0] = GET_LEN_L (self->template_len * self->template_num);
co_get_template.data_len[1] = GET_LEN_H (self->template_len * self->template_num); co_get_template.data_len[1] = GET_LEN_H (self->template_len * self->template_num);