[PATCH 1/2] winhttp: Always reset the second input buffer in netcon_secure_connect().

Hans Leidekker wine at gitlab.winehq.org
Wed Jul 6 03:43:00 CDT 2022


From: Hans Leidekker <hans at codeweavers.com>

---
 dlls/winhttp/net.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c
index be776ae2971..31d8529f1d7 100644
--- a/dlls/winhttp/net.c
+++ b/dlls/winhttp/net.c
@@ -343,14 +343,12 @@ DWORD netconn_secure_connect( struct netconn *conn, WCHAR *hostname, DWORD secur
 
             memmove(read_buf, (BYTE*)in_bufs[0].pvBuffer+in_bufs[0].cbBuffer-in_bufs[1].cbBuffer, in_bufs[1].cbBuffer);
             in_bufs[0].cbBuffer = in_bufs[1].cbBuffer;
-
-            in_bufs[1].BufferType = SECBUFFER_EMPTY;
-            in_bufs[1].cbBuffer = 0;
-            in_bufs[1].pvBuffer = NULL;
         }
 
         assert(in_bufs[0].BufferType == SECBUFFER_TOKEN);
         in_bufs[1].BufferType = SECBUFFER_EMPTY;
+        in_bufs[1].cbBuffer = 0;
+        in_bufs[1].pvBuffer = NULL;
 
         if(in_bufs[0].cbBuffer + 1024 > read_buf_size) {
             BYTE *new_read_buf;
-- 
GitLab


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



More information about the wine-devel mailing list