Commit 26b78f4d authored by Markus Armbruster's avatar Markus Armbruster Committed by Michael Tokarev
Browse files

libcacard: Convert two leftover realloc() to GLib 



Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarAlon Levy <alevy@redhat.com>
Signed-off-by: default avatarMichael Tokarev <mjt@tls.msk.ru>
parent f33a984d

libcacard/cac.c

+2 −11
Original line number Diff line number Diff line
@@ -169,17 +169,8 @@ cac_applet_pki_process_apdu(VCard *card, VCardAPDU *apdu, 
        }

        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);

        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);

        size += pki_applet->sign_buffer_len;

        switch (apdu->a_p1) {

libcacard/vcard_emul_nss.c

+2 −5
Original line number Diff line number Diff line
@@ -1178,11 +1178,8 @@ vcard_emul_options(const char *args) 


            if (opts->vreader_count >= reader_count) {

                reader_count += READER_STEP;

                vreaderOpt = realloc(opts->vreader,

                                reader_count * sizeof(*vreaderOpt));

                if (vreaderOpt == NULL) {

                    return opts; /* we're done */

                }

                vreaderOpt = g_renew(VirtualReaderOptions, opts->vreader,

                                     reader_count);

            }

            opts->vreader = vreaderOpt;

            vreaderOpt = &vreaderOpt[opts->vreader_count];