vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'alon/pull-libcacard-assert' into staging

master
Anthony Liguori 2011-10-31 10:14:06 -05:00
parent eca968d0d4 d9676f82e5
commit acba391493
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libcacard/cac.c
View File

@ -266,7 +266,8 @@ static void
cac_delete_pki_applet_private(VCardAppletPrivate *applet_private) cac_delete_pki_applet_private(VCardAppletPrivate *applet_private)
{ {
CACPKIAppletData *pki_applet_data = NULL; CACPKIAppletData *pki_applet_data = NULL;
if (pki_applet_data == NULL) {
if (applet_private == NULL) {
return; return;
} }
pki_applet_data = &(applet_private->u.pki_data); pki_applet_data = &(applet_private->u.pki_data);

2
libcacard/card_7816.c
View File

@ -754,7 +754,7 @@ vcard_process_apdu(VCard *card, VCardAPDU *apdu, VCardResponse **response)
return vcard7816_vm_process_apdu(card, apdu, response); return vcard7816_vm_process_apdu(card, apdu, response);
case VCARD_DIRECT: case VCARD_DIRECT:
/* if we are type direct, then the applet should handle everything */ /* if we are type direct, then the applet should handle everything */
assert("VCARD_DIRECT: applet failure"); assert(!"VCARD_DIRECT: applet failure");
break; break;
} }
*response = *response =

9
libcacard/vscclient.c
View File

@ -357,6 +357,7 @@ connect_to_qemu(
if (sock < 0) { if (sock < 0) {
/* Error */ /* Error */
fprintf(stderr, "Error opening socket!\n"); fprintf(stderr, "Error opening socket!\n");
return -1;
} }
memset(&hints, 0, sizeof(struct addrinfo)); memset(&hints, 0, sizeof(struct addrinfo));
@ -370,13 +371,13 @@ connect_to_qemu(
if (ret != 0) { if (ret != 0) {
/* Error */ /* Error */
fprintf(stderr, "getaddrinfo failed\n"); fprintf(stderr, "getaddrinfo failed\n");
return 5; return -1;
} }
if (connect(sock, server->ai_addr, server->ai_addrlen) < 0) { if (connect(sock, server->ai_addr, server->ai_addrlen) < 0) {
/* Error */ /* Error */
fprintf(stderr, "Could not connect\n"); fprintf(stderr, "Could not connect\n");
return 5; return -1;
} }
if (verbose) { if (verbose) {
printf("Connected (sizeof Header=%zd)!\n", sizeof(VSCMsgHeader)); printf("Connected (sizeof Header=%zd)!\n", sizeof(VSCMsgHeader));
@ -505,6 +506,10 @@ main(
qemu_host = strdup(argv[argc - 2]); qemu_host = strdup(argv[argc - 2]);
qemu_port = strdup(argv[argc - 1]); qemu_port = strdup(argv[argc - 1]);
sock = connect_to_qemu(qemu_host, qemu_port); sock = connect_to_qemu(qemu_host, qemu_port);
if (sock == -1) {
fprintf(stderr, "error opening socket, exiting.\n");
exit(5);
}
qemu_mutex_init(&write_lock); qemu_mutex_init(&write_lock);
qemu_mutex_init(&pending_reader_lock); qemu_mutex_init(&pending_reader_lock);