github/xrdp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix coverity warning over mem leak in smartcard code

Browse Source
This commit is contained in:
matt335672
2025-01-24 11:36:40 +00:00
parent b56b2da061
commit 201cdc1aea
1 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sesman/chansrv/smartcard_pcsc.c
+28 -23
View File
@@ -732,6 +732,7 @@ scard_function_list_readers_return(void *user_data,
struct trans *con;
struct pcsc_list_readers *pcscListReaders;
char *msz_readers = NULL;
int rv;
LOG_DEVEL(LOG_LEVEL_DEBUG, "scard_function_list_readers_return:");
LOG_DEVEL(LOG_LEVEL_DEBUG, " status 0x%8.8x", status);
@@ -788,37 +789,41 @@ scard_function_list_readers_return(void *user_data,
out_s = trans_get_out_s(con, 8192);
if (out_s == NULL)
{
return 1;
rv = 1;
}
s_push_layer(out_s, iso_hdr, 8);
out_uint32_le(out_s, llen);
out_uint32_le(out_s, readers);
else
{
const char *p = msz_readers;
for (index = 0; index < readers; index++)
s_push_layer(out_s, iso_hdr, 8);
out_uint32_le(out_s, llen);
out_uint32_le(out_s, readers);
{
unsigned int slen = strlen(p);
if (slen < 100)
const char *p = msz_readers;
for (index = 0; index < readers; index++)
{
out_uint8a(out_s, p, slen);
out_uint8s(out_s, 100 - slen);
unsigned int slen = strlen(p);
if (slen < 100)
{
out_uint8a(out_s, p, slen);
out_uint8s(out_s, 100 - slen);
}
else
{
out_uint8a(out_s, p, 99);
out_uint8s(out_s, 1);
}
p += (slen + 1);
}
else
{
out_uint8a(out_s, p, 99);
out_uint8s(out_s, 1);
}
p += (slen + 1);
}
out_uint32_le(out_s, status); /* SCARD_S_SUCCESS status */
s_mark_end(out_s);
bytes = (int) (out_s->end - out_s->data);
s_pop_layer(out_s, iso_hdr);
out_uint32_le(out_s, bytes - 8);
out_uint32_le(out_s, 0x03); /* SCARD_LIST_READERS 0x03 */
rv = trans_force_write(con);
}
free(msz_readers);
out_uint32_le(out_s, status); /* SCARD_S_SUCCESS status */
s_mark_end(out_s);
bytes = (int) (out_s->end - out_s->data);
s_pop_layer(out_s, iso_hdr);
out_uint32_le(out_s, bytes - 8);
out_uint32_le(out_s, 0x03); /* SCARD_LIST_READERS 0x03 */
return trans_force_write(con);
return rv;
}
/*****************************************************************************/