[PATCH 0/1] MR8826: winscard: Handle NULL send parameter in SCardTransmit().

[Hans Leidekker (＠hans)]

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=58608

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/8826

[PATCH 1/1] winscard: Handle NULL send parameter in SCardTransmit().

[Hans Leidekker]

From: Hans Leidekker <hans(a)codeweavers.com>

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=58608
---
 dlls/winscard/tests/winscard.c |  3 +++
 dlls/winscard/winscard.c       | 24 ++++++++++++++++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/dlls/winscard/tests/winscard.c b/dlls/winscard/tests/winscard.c
index ceb517a970e..63a1d8f4faa 100644
--- a/dlls/winscard/tests/winscard.c
+++ b/dlls/winscard/tests/winscard.c
@@ -207,6 +207,9 @@ static void test_SCardEstablishContext(void)
     ret = SCardTransmit( connect, &send_pci, cmd, sizeof(cmd), &recv_pci, recv_buf, NULL );
     ok( ret == SCARD_E_INVALID_PARAMETER, "got %lx (%lu)\n", ret, ret );
 
+    ret = SCardTransmit( connect, NULL, cmd, sizeof(cmd), &recv_pci, recv_buf, &len );
+    ok( ret == SCARD_S_SUCCESS, "got %lx (%lu)\n", ret, ret );
+
     len = sizeof(recv_buf);
     ret = SCardTransmit( connect, &send_pci, cmd, sizeof(cmd), &recv_pci, recv_buf, &len );
     ok( ret == SCARD_S_SUCCESS, "got %lx (%lu)\n", ret, ret );
diff --git a/dlls/winscard/winscard.c b/dlls/winscard/winscard.c
index 8749f5ea795..5a92b5110c6 100644
--- a/dlls/winscard/winscard.c
+++ b/dlls/winscard/winscard.c
@@ -146,6 +146,7 @@ struct handle
 {
     DWORD  magic;
     UINT64 unix_handle;
+    DWORD  protocol;
 };
 
 LONG WINAPI SCardEstablishContext( DWORD scope, const void *reserved1, const void *reserved2, SCARDCONTEXT *context )
@@ -304,6 +305,7 @@ LONG WINAPI SCardStatusA( SCARDHANDLE connect, char *names, DWORD *names_len, DW
     if (!(params.names = malloc( names_len_utf8 ))) return SCARD_E_NO_MEMORY;
     if (!(ret = UNIX_CALL( scard_status, ¶ms )) && !(ret = copy_multiszA( params.names, names, names_len )))
     {
+        handle->protocol = protocol64;
         if (state) *state = state64;
         if (protocol) *protocol = protocol64;
         if (atr_len) *atr_len = atr_len64;
@@ -405,6 +407,7 @@ LONG WINAPI SCardStatusW( SCARDHANDLE connect, WCHAR *names, DWORD *names_len, D
     if (!(params.names = malloc( names_len_utf8 ))) return SCARD_E_NO_MEMORY;
     if (!(ret = UNIX_CALL( scard_status, ¶ms )) && !(ret = copy_multiszW( params.names, names, names_len )))
     {
+        handle->protocol = protocol64;
         if (state) *state = state64;
         if (protocol) *protocol = protocol64;
         if (atr_len) *atr_len = atr_len64;
@@ -708,6 +711,7 @@ LONG WINAPI SCardConnectA( SCARDCONTEXT context, const char *reader, DWORD share
     if ((ret = UNIX_CALL( scard_connect, ¶ms ))) free( connect_handle );
     else
     {
+        connect_handle->protocol = protocol64;
         *connect = (SCARDHANDLE)connect_handle;
         if (protocol) *protocol = protocol64;
     }
@@ -750,6 +754,7 @@ LONG WINAPI SCardConnectW( SCARDCONTEXT context, const WCHAR *reader, DWORD shar
     if ((ret = UNIX_CALL( scard_connect, ¶ms ))) free( connect_handle );
     else
     {
+        connect_handle->protocol = protocol64;
         *connect = (SCARDHANDLE)connect_handle;
         if (protocol) *protocol = protocol64;
     }
@@ -776,7 +781,11 @@ LONG WINAPI SCardReconnect( SCARDHANDLE connect, DWORD share_mode, DWORD preferr
     params.preferred_protocols = preferred_protocols;
     params.initialization = initialization;
     params.protocol = &protocol64;
-    if (!(ret = UNIX_CALL( scard_reconnect, ¶ms )) && protocol) *protocol = protocol64;
+    if (!(ret = UNIX_CALL( scard_reconnect, ¶ms )))
+    {
+        handle->protocol = protocol64;
+        if (protocol) *protocol = protocol64;
+    }
     TRACE( "returning %#lx\n", ret );
     return ret;
 }
@@ -841,7 +850,7 @@ LONG WINAPI SCardTransmit( SCARDHANDLE connect, const SCARD_IO_REQUEST *send, co
 {
     struct handle *handle = (struct handle *)connect;
     struct scard_transmit_params params;
-    struct io_request send64 = { send->dwProtocol, send->cbPciLength }, recv64;
+    struct io_request send64, recv64;
     UINT64 recv_buflen64;
     LONG ret;
 
@@ -850,6 +859,17 @@ LONG WINAPI SCardTransmit( SCARDHANDLE connect, const SCARD_IO_REQUEST *send, co
     if (!handle || handle->magic != CONNECT_MAGIC) return ERROR_INVALID_HANDLE;
     if (!recv_buflen) return SCARD_E_INVALID_PARAMETER;
 
+    if (send)
+    {
+        send64.protocol = send->dwProtocol;
+        send64.pci_len = send->cbPciLength;
+    }
+    else
+    {
+        send64.protocol = handle->protocol;
+        send64.pci_len = sizeof(send64);
+    }
+
     params.handle = handle->unix_handle;
     params.send = &send64;
     params.send_buf = send_buf;
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/8826