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

mafpmoc: Do not compare differently signed values

Browse Source
This commit is contained in:
Marco Trevisan (Treviño)
2026-06-18 15:47:34 +02:00
parent b141eca270
commit b25cbff9be
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libfprint/drivers/mafpmoc/mafpmoc.c
+9 -8
View File
@@ -1,5 +1,6 @@
#define FP_COMPONENT "mafpmoc" #define FP_COMPONENT "mafpmoc"
#include "glib.h"
#include "drivers_api.h" #include "drivers_api.h"
#include "mafpmoc.h" #include "mafpmoc.h"
@@ -423,7 +424,7 @@ mafp_sensor_cmd (FpiDeviceMafpmoc *self,
uint8_t data_len, uint8_t data_len,
SynCmdMsgCallback callback) SynCmdMsgCallback callback)
{ {
g_autoptr(FpiUsbTransfer) transfer = alloc_cmd_transfer (self, cmd, (cmd < 0 ? 0 : 1), data, data_len); g_autoptr(FpiUsbTransfer) transfer = alloc_cmd_transfer (self, cmd, 1, data, data_len);
CommandData *cmd_data = g_new0 (CommandData, 1); CommandData *cmd_data = g_new0 (CommandData, 1);
@@ -689,7 +690,7 @@ fp_enroll_tpl_table_cb (FpiDeviceMafpmoc *self,
if (resp->result == MAFP_SUCCESS) if (resp->result == MAFP_SUCCESS)
{ {
mafp_load_enrolled_ids (self, resp); mafp_load_enrolled_ids (self, resp);
self->enroll_id = -1; self->enroll_id = G_MAXUINT16;
for (uint16_t i = 0; i < sizeof (resp->tpl_table.list); i++) for (uint16_t i = 0; i < sizeof (resp->tpl_table.list); i++)
{ {
if (!resp->tpl_table.list[i]) if (!resp->tpl_table.list[i])
@@ -698,7 +699,7 @@ fp_enroll_tpl_table_cb (FpiDeviceMafpmoc *self,
break; break;
} }
} }
if (self->enroll_id < 0) if (self->enroll_id == G_MAXUINT16)
{ {
mafp_mark_failed (dev, self->task_ssm, FP_DEVICE_ERROR_DATA_FULL, mafp_mark_failed (dev, self->task_ssm, FP_DEVICE_ERROR_DATA_FULL,
"fingerprints total num reached max"); "fingerprints total num reached max");
@@ -829,7 +830,7 @@ fp_enroll_verify_search_cb (FpiDeviceMafpmoc *self,
} }
else else
{ {
self->search_id = -1; self->search_id = G_MAXUINT16;
if (self->enroll_stage >= self->max_enroll_stage) if (self->enroll_stage >= self->max_enroll_stage)
fpi_ssm_jump_to_state (self->task_ssm, FP_ENROLL_SAVE_TEMPLATE_INFO); fpi_ssm_jump_to_state (self->task_ssm, FP_ENROLL_SAVE_TEMPLATE_INFO);
else else
@@ -1592,7 +1593,7 @@ fp_verify_search_step_cb (FpiDeviceMafpmoc *self,
return; return;
} }
} }
self->search_id = -1; self->search_id = G_MAXUINT16;
fpi_ssm_jump_to_state (self->task_ssm, FP_VERIFY_GET_TEMPLATE_INFO); fpi_ssm_jump_to_state (self->task_ssm, FP_VERIFY_GET_TEMPLATE_INFO);
} }
} }
@@ -1809,7 +1810,7 @@ fp_verify_sm_run_state (FpiSsm *ssm, FpDevice *device)
fpi_device_get_verify_data (device, &print); fpi_device_get_verify_data (device, &print);
if (!print) if (!print)
{ {
self->search_id = -1; self->search_id = G_MAXUINT16;
fpi_ssm_jump_to_state (self->task_ssm, FP_VERIFY_GET_TEMPLATE_INFO); fpi_ssm_jump_to_state (self->task_ssm, FP_VERIFY_GET_TEMPLATE_INFO);
break; break;
} }
@@ -1819,7 +1820,7 @@ fp_verify_sm_run_state (FpiSsm *ssm, FpDevice *device)
fpi_device_get_identify_data (device, &prints); fpi_device_get_identify_data (device, &prints);
if (!prints || prints->len == 0) if (!prints || prints->len == 0)
{ {
self->search_id = -1; self->search_id = G_MAXUINT16;
fpi_ssm_jump_to_state (self->task_ssm, FP_VERIFY_GET_TEMPLATE_INFO); fpi_ssm_jump_to_state (self->task_ssm, FP_VERIFY_GET_TEMPLATE_INFO);
break; break;
} }
@@ -1833,7 +1834,7 @@ fp_verify_sm_run_state (FpiSsm *ssm, FpDevice *device)
break; break;
case FP_VERIFY_GET_TEMPLATE_INFO: case FP_VERIFY_GET_TEMPLATE_INFO:
if (self->search_id == -1) if (self->search_id == G_MAXUINT16)
{ {
mafp_cmd_response_t resp; mafp_cmd_response_t resp;
resp.result = 1; resp.result = 1;