ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libcacard: Convert two leftover realloc() to GLib 

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Alon Levy <alevy@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
This commit is contained in:
Markus Armbruster 2014-05-23 13:24:37 +02:00 committed by Michael Tokarev
parent f33a984d51
commit 26b78f4d3c
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libcacard/cac.c
View File

@ -169,17 +169,8 @@ cac_applet_pki_process_apdu(VCard *card, VCardAPDU *apdu,
} }
size = apdu->a_Lc; size = apdu->a_Lc;
sign_buffer = realloc(pki_applet->sign_buffer, sign_buffer = g_realloc(pki_applet->sign_buffer,
pki_applet->sign_buffer_len+size); pki_applet->sign_buffer_len + size);
if (sign_buffer == NULL) {
g_free(pki_applet->sign_buffer);
pki_applet->sign_buffer = NULL;
pki_applet->sign_buffer_len = 0;
*response = vcard_make_response(
VCARD7816_STATUS_EXC_ERROR_MEMORY_FAILURE);
ret = VCARD_DONE;
break;
}
memcpy(sign_buffer+pki_applet->sign_buffer_len, apdu->a_body, size); memcpy(sign_buffer+pki_applet->sign_buffer_len, apdu->a_body, size);
size += pki_applet->sign_buffer_len; size += pki_applet->sign_buffer_len;
switch (apdu->a_p1) { switch (apdu->a_p1) {

7
libcacard/vcard_emul_nss.c
View File

@ -1178,11 +1178,8 @@ vcard_emul_options(const char *args)
if (opts->vreader_count >= reader_count) { if (opts->vreader_count >= reader_count) {
reader_count += READER_STEP; reader_count += READER_STEP;
vreaderOpt = realloc(opts->vreader, vreaderOpt = g_renew(VirtualReaderOptions, opts->vreader,
reader_count * sizeof(*vreaderOpt)); reader_count);
if (vreaderOpt == NULL) {
return opts; /* we're done */
}
} }
opts->vreader = vreaderOpt; opts->vreader = vreaderOpt;
vreaderOpt = &vreaderOpt[opts->vreader_count]; vreaderOpt = &vreaderOpt[opts->vreader_count];