Merge branch 'master' into coverity_scan

pcsc-relay/src/pcsc.c

@@ -128,7 +128,7 @@ static int pcsc_connect(driver_data_t **driver_data)
         RELAY_ERROR("Could not connect to %s\n", reader);
         goto err;
     }
-    INFO("Connected to reader %u: %s\n", i, reader);
+    INFO("Connected to reader %zu: %s\n", i, reader);
     hexdump("Card's ATR: ", state.rgbAtr, state.cbAtr);
 
 err:

virtualsmartcard/src/vpcd/vpcd.c

@@ -110,8 +110,10 @@ static int opensock(unsigned short port)
     server_sockaddr.sin_addr.s_addr = htonl(INADDR_ANY);
 
     if (bind(sock, (struct sockaddr *) &server_sockaddr,
-                sizeof server_sockaddr) != 0)
+                sizeof server_sockaddr) != 0) {
+        close(sock);
         return -1;
+    }
 
     if (listen(sock, 0) != 0) {
 		close(sock);