Added patch to hold CS while iterating through rpcrt4 protseqs list.

This commit is contained in:
Sebastian Lackner 2017-07-21 03:18:46 +02:00
parent 60d4b6fe21
commit 4e031ef171
2 changed files with 43 additions and 0 deletions

View File

@ -317,6 +317,7 @@ patch_enable_all ()
enable_quartz_Silence_FIXMEs="$1"
enable_riched20_Class_Tests="$1"
enable_riched20_IText_Interface="$1"
enable_rpcrt4_Race_Condition="$1"
enable_secur32_Zero_Buffer_Length="$1"
enable_server_ClipCursor="$1"
enable_server_CreateProcess_ACLs="$1"
@ -1208,6 +1209,9 @@ patch_enable ()
riched20-IText_Interface)
enable_riched20_IText_Interface="$2"
;;
rpcrt4-Race_Condition)
enable_rpcrt4_Race_Condition="$2"
;;
secur32-Zero_Buffer_Length)
enable_secur32_Zero_Buffer_Length="$2"
;;
@ -7126,6 +7130,18 @@ if test "$enable_riched20_IText_Interface" -eq 1; then
) >> "$patchlist"
fi
# Patchset rpcrt4-Race_Condition
# |
# | Modified files:
# | * dlls/rpcrt4/rpc_server.c
# |
if test "$enable_rpcrt4_Race_Condition" -eq 1; then
patch_apply rpcrt4-Race_Condition/0001-rpcrt4-Hold-CS-while-iterating-through-protseqs-list.patch
(
printf '%s\n' '+ { "Sebastian Lackner", "rpcrt4: Hold CS while iterating through protseqs list.", 1 },';
) >> "$patchlist"
fi
# Patchset secur32-Zero_Buffer_Length
# |
# | This patchset fixes the following Wine bugs:

View File

@ -0,0 +1,27 @@
From 3a98fa11972dec8bdbc5139097f5c64f2a4fb1fb Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Fri, 21 Jul 2017 01:31:54 +0200
Subject: rpcrt4: Hold CS while iterating through protseqs list.
---
dlls/rpcrt4/rpc_server.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c
index c350c5970c2..d1b5d64ecea 100644
--- a/dlls/rpcrt4/rpc_server.c
+++ b/dlls/rpcrt4/rpc_server.c
@@ -806,8 +806,10 @@ static RPC_STATUS RPCRT4_stop_listen(BOOL auto_listen)
if (stop_listen) {
RpcServerProtseq *cps;
+ EnterCriticalSection(&server_cs);
LIST_FOR_EACH_ENTRY(cps, &protseqs, RpcServerProtseq, entry)
RPCRT4_sync_with_server_thread(cps);
+ LeaveCriticalSection(&server_cs);
}
if (!auto_listen)
--
2.13.1