Merge remote-tracking branch 'alon/pull-libcacard-assert' into staging
This commit is contained in:
commit
acba391493
|
@ -266,7 +266,8 @@ static void
|
|||
cac_delete_pki_applet_private(VCardAppletPrivate *applet_private)
|
||||
{
|
||||
CACPKIAppletData *pki_applet_data = NULL;
|
||||
if (pki_applet_data == NULL) {
|
||||
|
||||
if (applet_private == NULL) {
|
||||
return;
|
||||
}
|
||||
pki_applet_data = &(applet_private->u.pki_data);
|
||||
|
|
|
@ -754,7 +754,7 @@ vcard_process_apdu(VCard *card, VCardAPDU *apdu, VCardResponse **response)
|
|||
return vcard7816_vm_process_apdu(card, apdu, response);
|
||||
case VCARD_DIRECT:
|
||||
/* if we are type direct, then the applet should handle everything */
|
||||
assert("VCARD_DIRECT: applet failure");
|
||||
assert(!"VCARD_DIRECT: applet failure");
|
||||
break;
|
||||
}
|
||||
*response =
|
||||
|
|
|
@ -357,6 +357,7 @@ connect_to_qemu(
|
|||
if (sock < 0) {
|
||||
/* Error */
|
||||
fprintf(stderr, "Error opening socket!\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
memset(&hints, 0, sizeof(struct addrinfo));
|
||||
|
@ -370,13 +371,13 @@ connect_to_qemu(
|
|||
if (ret != 0) {
|
||||
/* Error */
|
||||
fprintf(stderr, "getaddrinfo failed\n");
|
||||
return 5;
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (connect(sock, server->ai_addr, server->ai_addrlen) < 0) {
|
||||
/* Error */
|
||||
fprintf(stderr, "Could not connect\n");
|
||||
return 5;
|
||||
return -1;
|
||||
}
|
||||
if (verbose) {
|
||||
printf("Connected (sizeof Header=%zd)!\n", sizeof(VSCMsgHeader));
|
||||
|
@ -505,6 +506,10 @@ main(
|
|||
qemu_host = strdup(argv[argc - 2]);
|
||||
qemu_port = strdup(argv[argc - 1]);
|
||||
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(&pending_reader_lock);
|
||||
|
|
Loading…
Reference in a new issue