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

libcacard: Drop superfluous conditionals around g_free() 

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
This commit is contained in:
Markus Armbruster 2014-06-06 18:32:08 +02:00 committed by Michael Tokarev
parent 6b1dd54b6a
commit ec15993d9d
5 changed files with 12 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libcacard/cac.c
View File

@ -100,10 +100,8 @@ cac_applet_pki_reset(VCard *card, int channel)
pki_applet = &(applet_private->u.pki_data); pki_applet = &(applet_private->u.pki_data);
pki_applet->cert_buffer = NULL; pki_applet->cert_buffer = NULL;
if (pki_applet->sign_buffer) {
g_free(pki_applet->sign_buffer); g_free(pki_applet->sign_buffer);
pki_applet->sign_buffer = NULL; pki_applet->sign_buffer = NULL;
}
pki_applet->cert_buffer_len = 0; pki_applet->cert_buffer_len = 0;
pki_applet->sign_buffer_len = 0; pki_applet->sign_buffer_len = 0;
return VCARD_DONE; return VCARD_DONE;
@ -285,12 +283,8 @@ cac_delete_pki_applet_private(VCardAppletPrivate *applet_private)
return; return;
} }
pki_applet_data = &(applet_private->u.pki_data); pki_applet_data = &(applet_private->u.pki_data);
if (pki_applet_data->cert != NULL) {
g_free(pki_applet_data->cert); g_free(pki_applet_data->cert);
}
if (pki_applet_data->sign_buffer != NULL) {
g_free(pki_applet_data->sign_buffer); g_free(pki_applet_data->sign_buffer);
}
if (pki_applet_data->key != NULL) { if (pki_applet_data->key != NULL) {
vcard_emul_delete_key(pki_applet_data->key); vcard_emul_delete_key(pki_applet_data->key);
} }

6
libcacard/card_7816.c
View File

@ -172,16 +172,12 @@ vcard_response_delete(VCardResponse *response)
switch (response->b_type) { switch (response->b_type) {
case VCARD_MALLOC: case VCARD_MALLOC:
/* everything was malloc'ed */ /* everything was malloc'ed */
if (response->b_data) {
g_free(response->b_data); g_free(response->b_data);
}
g_free(response); g_free(response);
break; break;
case VCARD_MALLOC_DATA: case VCARD_MALLOC_DATA:
/* only the data buffer was malloc'ed */ /* only the data buffer was malloc'ed */
if (response->b_data) {
g_free(response->b_data); g_free(response->b_data);
}
break; break;
case VCARD_MALLOC_STRUCT: case VCARD_MALLOC_STRUCT:
/* only the structure was malloc'ed */ /* only the structure was malloc'ed */
@ -358,9 +354,7 @@ vcard_apdu_delete(VCardAPDU *apdu)
if (apdu == NULL) { if (apdu == NULL) {
return; return;
} }
if (apdu->a_data) {
g_free(apdu->a_data); g_free(apdu->a_data);
}
g_free(apdu); g_free(apdu);
} }

4
libcacard/vcard.c
View File

@ -51,9 +51,7 @@ vcard_buffer_response_delete(VCardBufferResponse *buffer_response)
if (buffer_response == NULL) { if (buffer_response == NULL) {
return; return;
} }
if (buffer_response->buffer) {
g_free(buffer_response->buffer); g_free(buffer_response->buffer);
}
g_free(buffer_response); g_free(buffer_response);
} }
@ -121,10 +119,8 @@ vcard_delete_applet(VCardApplet *applet)
applet->applet_private_free(applet->applet_private); applet->applet_private_free(applet->applet_private);
applet->applet_private = NULL; applet->applet_private = NULL;
} }
if (applet->aid) {
g_free(applet->aid); g_free(applet->aid);
applet->aid = NULL; applet->aid = NULL;
}
g_free(applet); g_free(applet);
} }

2
libcacard/vcard_emul_nss.c
View File

@ -471,9 +471,7 @@ vreader_emul_delete(VReaderEmul *vreader_emul)
if (vreader_emul->slot) { if (vreader_emul->slot) {
PK11_FreeSlot(vreader_emul->slot); PK11_FreeSlot(vreader_emul->slot);
} }
if (vreader_emul->type_params) {
g_free(vreader_emul->type_params); g_free(vreader_emul->type_params);
}
g_free(vreader_emul); g_free(vreader_emul);
} }

2
libcacard/vreader.c
View File

@ -155,9 +155,7 @@ vreader_free(VReader *reader)
if (reader->card) { if (reader->card) {
vcard_free(reader->card); vcard_free(reader->card);
} }
if (reader->name) {
g_free(reader->name); g_free(reader->name);
}
if (reader->reader_private_free) { if (reader->reader_private_free) {
reader->reader_private_free(reader->reader_private); reader->reader_private_free(reader->reader_private);
} }