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

upekts: Fix memory leak and remove unneeded copy

Browse source 
__handle_incoming_msg would copy the payload of the message into a newly
created buffer just to destroy it again immediately after calling the
callback. Just reference the correct address inside the original package
instead.

Also, in one case the extra buffer was leaked afterwards.
This commit is contained in:
Benjamin Berg 2020-05-08 09:02:03 +02:00 committed by Benjamin Berg
parent 484743f652
commit b95402bc72
1 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libfprint/drivers/upekts.c
View file

@ -238,7 +238,6 @@ __handle_incoming_msg (FpDevice *device,
guint16 len; guint16 len;
guint16 computed_crc; guint16 computed_crc;
guint16 msg_crc; guint16 msg_crc;
unsigned char *retdata = NULL;
unsigned char code_a, code_b; unsigned char code_a, code_b;
g_assert (udata->buflen >= 6); g_assert (udata->buflen >= 6);
@ -273,12 +272,7 @@ __handle_incoming_msg (FpDevice *device,
return; return;
} }
if (len > 0) udata->callback (device, READ_MSG_CMD, code_a, 0, buf + 7, len,
{
retdata = g_malloc (len);
memcpy (retdata, buf + 7, len);
}
udata->callback (device, READ_MSG_CMD, code_a, 0, retdata, len,
udata->user_data, NULL); udata->user_data, NULL);
goto done; goto done;
} }
@ -315,14 +309,8 @@ __handle_incoming_msg (FpDevice *device,
innerlen = innerlen - 3; innerlen = innerlen - 3;
_subcmd = innerbuf[5]; _subcmd = innerbuf[5];
fp_dbg ("device responds to subcmd %x with %d bytes", _subcmd, innerlen); fp_dbg ("device responds to subcmd %x with %d bytes", _subcmd, innerlen);
if (innerlen > 0)
{
retdata = g_malloc (innerlen);
memcpy (retdata, innerbuf + 6, innerlen);
}
udata->callback (device, READ_MSG_RESPONSE, code_b, _subcmd, udata->callback (device, READ_MSG_RESPONSE, code_b, _subcmd,
retdata, innerlen, udata->user_data, NULL); innerbuf + 6, innerlen, udata->user_data, NULL);
g_free (retdata);
goto done; goto done;
} }
else else