cookiez/pam-fprint-grosshack
1
0
Fork 0
mirror of https://gitlab.com/mishakmak/pam-fprint-grosshack.git synced 2026-04-08 20:03:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix memleak on VerifyStart

Browse Source 
Clean up the data pass to the async verification and identification
functions ourselves.
This commit is contained in:
Bastien Nocera
2008-11-24 15:23:05 +00:00
committed by Daniel Drake
parent 7b06c4b7f3
commit 64e415aaac
2 changed files with 33 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
TODO
View File

@ -7,9 +7,6 @@ Register fprintd' po file with Transifex, Rosetta or the Translation Project
Support insertion/removal of devices Support insertion/removal of devices
Fix memory leaks with print data/gallery when using the verify_async and
identify_async
Add some hardware protection by making sure devices aren't opened and Add some hardware protection by making sure devices aren't opened and
reading for more than a certain amount of time. reading for more than a certain amount of time.

35
src/device.c
View File

@ -110,6 +110,11 @@ struct FprintDevicePrivate {
/* Hashtable of connected clients */ /* Hashtable of connected clients */
GHashTable *clients; GHashTable *clients;
/* The data passed to fp_async_verify_start or
* fp_async_identify_start */
struct fp_print_data *verify_data;
struct fp_print_data **identify_data;
/* whether we're running an identify, or a verify */ /* whether we're running an identify, or a verify */
FprintDeviceAction current_action; FprintDeviceAction current_action;
}; };
@ -773,6 +778,7 @@ static void verify_cb(struct fp_dev *dev, int r, struct fp_img *img,
void *user_data) void *user_data)
{ {
struct FprintDevice *rdev = user_data; struct FprintDevice *rdev = user_data;
FprintDevicePrivate *priv = DEVICE_GET_PRIVATE(rdev);
const char *name = verify_result_to_name (r); const char *name = verify_result_to_name (r);
gboolean done = FALSE; gboolean done = FALSE;
@ -782,12 +788,18 @@ static void verify_cb(struct fp_dev *dev, int r, struct fp_img *img,
done = TRUE; done = TRUE;
g_signal_emit(rdev, signals[SIGNAL_VERIFY_STATUS], 0, name, done); g_signal_emit(rdev, signals[SIGNAL_VERIFY_STATUS], 0, name, done);
fp_img_free(img); fp_img_free(img);
if (done && priv->verify_data) {
fp_print_data_free (priv->verify_data);
priv->verify_data = NULL;
}
} }
static void identify_cb(struct fp_dev *dev, int r, static void identify_cb(struct fp_dev *dev, int r,
size_t match_offset, struct fp_img *img, void *user_data) size_t match_offset, struct fp_img *img, void *user_data)
{ {
struct FprintDevice *rdev = user_data; struct FprintDevice *rdev = user_data;
FprintDevicePrivate *priv = DEVICE_GET_PRIVATE(rdev);
const char *name = verify_result_to_name (r); const char *name = verify_result_to_name (r);
gboolean done = FALSE; gboolean done = FALSE;
@ -797,6 +809,14 @@ static void identify_cb(struct fp_dev *dev, int r,
done = TRUE; done = TRUE;
g_signal_emit(rdev, signals[SIGNAL_VERIFY_STATUS], 0, name, done); g_signal_emit(rdev, signals[SIGNAL_VERIFY_STATUS], 0, name, done);
fp_img_free(img); fp_img_free(img);
if (done && priv->identify_data != NULL) {
guint i;
for (i = 0; priv->identify_data[i] != NULL; i++)
fp_print_data_free(priv->identify_data[i]);
g_free (priv->identify_data);
priv->identify_data = NULL;
}
} }
static void fprint_device_verify_start(FprintDevice *rdev, static void fprint_device_verify_start(FprintDevice *rdev,
@ -882,7 +902,6 @@ static void fprint_device_verify_start(FprintDevice *rdev,
priv->current_action = ACTION_IDENTIFY; priv->current_action = ACTION_IDENTIFY;
g_message ("start identification device %d", priv->id); g_message ("start identification device %d", priv->id);
//FIXME we're supposed to free the gallery here?
r = fp_async_identify_start (priv->dev, gallery, identify_cb, rdev); r = fp_async_identify_start (priv->dev, gallery, identify_cb, rdev);
} else { } else {
priv->current_action = ACTION_VERIFY; priv->current_action = ACTION_VERIFY;
@ -899,7 +918,6 @@ static void fprint_device_verify_start(FprintDevice *rdev,
return; return;
} }
/* FIXME fp_async_verify_start should copy the fp_print_data */
r = fp_async_verify_start(priv->dev, data, verify_cb, rdev); r = fp_async_verify_start(priv->dev, data, verify_cb, rdev);
} }
@ -923,6 +941,8 @@ static void fprint_device_verify_start(FprintDevice *rdev,
dbus_g_method_return_error(context, error); dbus_g_method_return_error(context, error);
return; return;
} }
priv->verify_data = data;
priv->identify_data = gallery;
dbus_g_method_return(context); dbus_g_method_return(context);
} }
@ -955,8 +975,19 @@ static void fprint_device_verify_stop(FprintDevice *rdev,
} }
if (priv->current_action == ACTION_VERIFY) { if (priv->current_action == ACTION_VERIFY) {
if (priv->verify_data) {
fp_print_data_free (priv->verify_data);
priv->verify_data = NULL;
}
r = fp_async_verify_stop(priv->dev, verify_stop_cb, context); r = fp_async_verify_stop(priv->dev, verify_stop_cb, context);
} else if (priv->current_action == ACTION_IDENTIFY) { } else if (priv->current_action == ACTION_IDENTIFY) {
if (priv->identify_data != NULL) {
guint i;
for (i = 0; priv->identify_data[i] != NULL; i++)
fp_print_data_free(priv->identify_data[i]);
g_free (priv->identify_data);
priv->identify_data = NULL;
}
r = fp_async_identify_stop(priv->dev, identify_stop_cb, context); r = fp_async_identify_stop(priv->dev, identify_stop_cb, context);
} else { } else {
g_set_error(&error, FPRINT_ERROR, FPRINT_ERROR_NO_ACTION_IN_PROGRESS, g_set_error(&error, FPRINT_ERROR, FPRINT_ERROR_NO_ACTION_IN_PROGRESS,