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

elan: Fix frame leak in elan_submit_image

Browse source
This commit is contained in:
Igor Filatov 2018-12-23 11:51:55 +02:00 committed by Bastien Nocera
parent 860a256f4b
commit ae1b10dba8
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
libfprint/drivers/elan.c
View file

@ -293,23 +293,22 @@ static void elan_process_frame_thirds(unsigned short *raw_frame,
static void elan_submit_image(struct fp_img_dev *dev) static void elan_submit_image(struct fp_img_dev *dev)
{ {
struct elan_dev *elandev = FP_INSTANCE_DATA(FP_DEV(dev)); struct elan_dev *elandev = FP_INSTANCE_DATA(FP_DEV(dev));
int num_frames;
GSList *raw_frames;
GSList *frames = NULL; GSList *frames = NULL;
struct fp_img *img; struct fp_img *img;
G_DEBUG_HERE(); G_DEBUG_HERE();
for (int i = 0; i < ELAN_SKIP_LAST_FRAMES; i++) num_frames = elandev->num_frames - ELAN_SKIP_LAST_FRAMES;
elandev->frames = g_slist_next(elandev->frames); raw_frames = g_slist_nth(elandev->frames, ELAN_SKIP_LAST_FRAMES);
elandev->num_frames -= ELAN_SKIP_LAST_FRAMES;
assembling_ctx.frame_width = elandev->frame_width; assembling_ctx.frame_width = elandev->frame_width;
assembling_ctx.frame_height = elandev->frame_height; assembling_ctx.frame_height = elandev->frame_height;
assembling_ctx.image_width = elandev->frame_width * 3 / 2; assembling_ctx.image_width = elandev->frame_width * 3 / 2;
g_slist_foreach(elandev->frames, (GFunc) elandev->process_frame, g_slist_foreach(raw_frames, (GFunc) elandev->process_frame, &frames);
&frames); fpi_do_movement_estimation(&assembling_ctx, frames, num_frames);
fpi_do_movement_estimation(&assembling_ctx, frames, img = fpi_assemble_frames(&assembling_ctx, frames, num_frames);
elandev->num_frames);
img = fpi_assemble_frames(&assembling_ctx, frames, elandev->num_frames);
img->flags |= FP_IMG_PARTIAL; img->flags |= FP_IMG_PARTIAL;
fpi_imgdev_image_captured(dev, img); fpi_imgdev_image_captured(dev, img);