[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 5/7] libcacard: Convert two leftover realloc() to GL
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 5/7] libcacard: Convert two leftover realloc() to GLib |
Date: |
Thu, 22 May 2014 16:57:20 +0200 |
Signed-off-by: Markus Armbruster <address@hidden>
---
libcacard/cac.c | 13 ++-----------
libcacard/vcard_emul_nss.c | 6 +-----
2 files changed, 3 insertions(+), 16 deletions(-)
diff --git a/libcacard/cac.c b/libcacard/cac.c
index 74ef3e3..05ce8a2 100644
--- a/libcacard/cac.c
+++ b/libcacard/cac.c
@@ -169,17 +169,8 @@ cac_applet_pki_process_apdu(VCard *card, VCardAPDU *apdu,
}
size = apdu->a_Lc;
- sign_buffer = 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;
- }
+ sign_buffer = g_realloc(pki_applet->sign_buffer,
+ pki_applet->sign_buffer_len + size);
memcpy(sign_buffer+pki_applet->sign_buffer_len, apdu->a_body, size);
size += pki_applet->sign_buffer_len;
switch (apdu->a_p1) {
diff --git a/libcacard/vcard_emul_nss.c b/libcacard/vcard_emul_nss.c
index 692534c..f98541f 100644
--- a/libcacard/vcard_emul_nss.c
+++ b/libcacard/vcard_emul_nss.c
@@ -1178,11 +1178,7 @@ 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_new(VirtualReaderOptions, reader_count);
}
opts->vreader = vreaderOpt;
vreaderOpt = &vreaderOpt[opts->vreader_count];
--
1.9.0
- [Qemu-devel] [PATCH 0/7] libcacard: A few simple fixes and cleanups, Markus Armbruster, 2014/05/22
- [Qemu-devel] [PATCH 4/7] libcacard/vreader: Tighten assertion to clarify intent, Markus Armbruster, 2014/05/22
- [Qemu-devel] [PATCH 7/7] libcacard/vcard_emul_nss: Drop a redundant conditional, Markus Armbruster, 2014/05/22
- [Qemu-devel] [PATCH 5/7] libcacard: Convert two leftover realloc() to GLib,
Markus Armbruster <=
- [Qemu-devel] [PATCH 3/7] libcacard/vreader: Drop broken recovery from failed assertion, Markus Armbruster, 2014/05/22
- [Qemu-devel] [PATCH 6/7] libcacard/vcard_emul_nss: Assert vreaderOpt isn't null, Markus Armbruster, 2014/05/22
- [Qemu-devel] [PATCH 2/7] libcacard: Plug memory leaks around vreader_get_reader_list(), Markus Armbruster, 2014/05/22
- [Qemu-devel] [PATCH 1/7] libcacard/vscclient: Bury some dead code, Markus Armbruster, 2014/05/22
- Re: [Qemu-devel] [PATCH 0/7] libcacard: A few simple fixes and cleanups, Alon Levy, 2014/05/22