Attachment 139859 Details for Bug 106730 – vfs5011: Error out when no lines were captured

[patch] vfs5011: Error out when no lines were captured

vfs5011-Error-out-when-no-lines-were-captured.patch (text/plain), 1.79 KB, created by Bastien Nocera on 2018-05-30 13:55:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bastien Nocera

Created: 2018-05-30 13:55:20 UTC

Size: 1.79 KB

patch

obsolete

>From a5d4772172b1bb1481ce5f73df9b67829b2c6cdb Mon Sep 17 00:00:00 2001
>From: Bastien Nocera <hadess@hadess.net>
>Date: Wed, 30 May 2018 15:14:42 +0200
>Subject: [PATCH] vfs5011: Error out when no lines were captured
>
>Which avoids passing zero lines to fpi_assemble_lines()
>
>"gmem.c:130: failed to allocate 18446744073709551612 bytes"
>
> #3  0x00007fe4f6ef428f in g_log (log_domain=log_domain@entry=0x7fe4f6f3506e "GLib", log_level=log_level@entry=G_LOG_LEVEL_ERROR, format=format@entry=0x7fe4f6f3e610 "%s: failed to allocate %lu bytes") at gmessages.c:1398
> #4  0x00007fe4f6ef2ac4 in g_malloc0 (n_bytes=n_bytes@entry=18446744073709551612) at gmem.c:129
> #5  0x00007fe4f8052020 in median_filter (filtersize=25, size=-1, data=0x0) at assembling.c:309
> #6  fpi_assemble_lines (ctx=ctx@entry=0x7fe4f82ac3c0 <assembling_ctx>, lines=0x0, lines_len=0) at assembling.c:389
> #7  0x00007fe4f805f3db in submit_image (ssm=ssm@entry=0x16c3cba360, data=data@entry=0x16c3cb9cc0) at drivers/vfs5011.c:412
>
>See https://bugzilla.redhat.com/show_bug.cgi?id=1484812
>
>https://bugs.freedesktop.org/show_bug.cgi?id=106730
>---
> libfprint/drivers/vfs5011.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
>diff --git a/libfprint/drivers/vfs5011.c b/libfprint/drivers/vfs5011.c
>index 0c50d99..8b460ac 100644
>--- a/libfprint/drivers/vfs5011.c
>+++ b/libfprint/drivers/vfs5011.c
>@@ -400,6 +400,14 @@ void submit_image(struct fpi_ssm *ssm, struct vfs5011_data *data)
> 	struct fp_img_dev *dev = fpi_ssm_get_user_data(ssm);
> 	struct fp_img *img;
> 
>+	if (data->lines_recorded == 0) {
>+		/* == FP_ENROLL_RETRY_TOO_SHORT */
>+		fpi_imgdev_session_error(dev, FP_VERIFY_RETRY_TOO_SHORT);
>+		return;
>+	}
>+
>+	g_assert (data->rows != NULL);
>+
> 	data->rows = g_slist_reverse(data->rows);
> 
> 	img = fpi_assemble_lines(&assembling_ctx, data->rows, data->lines_recorded);
>-- 
>2.17.0

Actions: View | Splinter Review

Attachments on bug 106730: 139858 | 139859

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.