diff options
| author | Benjamin Berg <bberg@redhat.com> | 2019-06-18 22:36:38 +0200 |
|---|---|---|
| committer | Benjamin Berg <bberg@redhat.com> | 2019-06-18 22:36:38 +0200 |
| commit | 400cacf8671832b26c3ffcc6e09f263ab285ed3e (patch) | |
| tree | e077603e227f43083ead26f89e3c7755810872fc | |
| parent | 4cec28416eb622a223ad30b9d63306573b9d04de (diff) | |
elan: Fix memory leak in elan_submit_imagebenzea/fix-elan-leak
elan_submit_image would modify the list of received frames in place,
without freeing the associated memory. Fix this by using a local
variable so that the list remains unmodified and is fully released by
elan_dev_reset.
| -rw-r--r-- | libfprint/drivers/elan.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libfprint/drivers/elan.c b/libfprint/drivers/elan.c index 7c014aa..c89cdc7 100644 --- a/libfprint/drivers/elan.c +++ b/libfprint/drivers/elan.c @@ -293,23 +293,24 @@ static void elan_process_frame_thirds(unsigned short *raw_frame, static void elan_submit_image(struct fp_img_dev *dev) { struct elan_dev *elandev = FP_INSTANCE_DATA(FP_DEV(dev)); + GSList *input_frames; GSList *frames = NULL; struct fp_img *img; G_DEBUG_HERE(); + input_frames = elandev->frames; for (int i = 0; i < ELAN_SKIP_LAST_FRAMES; i++) - elandev->frames = g_slist_next(elandev->frames); - elandev->num_frames -= ELAN_SKIP_LAST_FRAMES; + input_frames = g_slist_next (input_frames); assembling_ctx.frame_width = elandev->frame_width; assembling_ctx.frame_height = elandev->frame_height; assembling_ctx.image_width = elandev->frame_width * 3 / 2; - g_slist_foreach(elandev->frames, (GFunc) elandev->process_frame, + g_slist_foreach(input_frames, (GFunc) elandev->process_frame, &frames); fpi_do_movement_estimation(&assembling_ctx, frames, elandev->num_frames); - img = fpi_assemble_frames(&assembling_ctx, frames, elandev->num_frames); + img = fpi_assemble_frames(&assembling_ctx, frames, elandev->num_frames - ELAN_SKIP_LAST_FRAMES); img->flags |= FP_IMG_PARTIAL; fpi_imgdev_image_captured(dev, img); |