wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-01-28 22:04:43 -08:00
Code Issues Packages Projects Releases Wiki Activity

Removed patch to fix uninitialized memory access in ws2_32.do_poll (already fixed upstream).

Browse Source
This commit is contained in:
Sebastian Lackner 2015-07-13 21:51:45 +02:00
parent 800c42803f
commit a8303d406b
2 changed files with 17 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
patches/Coverity/0001-ws2_32-Fix-uninitialized-memory-access-in-do_poll-Co.patch
View File

@ -1,25 +0,0 @@
From eba72a3ed5d6f61c92ce2926d8305d19dc66425b Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 30 May 2015 17:08:18 +0200
Subject: ws2_32: Fix uninitialized memory access in do_poll (Coverity).
---
dlls/ws2_32/socket.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index fdf68a3..60c6ec5 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -4794,7 +4794,7 @@ static int do_poll(struct pollfd *pollfds, int count, int timeout)
struct timeval tv1, tv2;
int ret, torig = timeout;
- if (timeout > 0) gettimeofday( &tv1, 0 );
+ if (timeout >= 0) gettimeofday( &tv1, 0 );
while ((ret = poll( pollfds, count, timeout )) < 0)
{
--
2.4.2

50
patches/patchinstall.sh
View File

@ -76,7 +76,6 @@ warning()
patch_enable_all ()
{
enable_Compiler_Warnings="$1"
enable_Coverity="$1"
enable_Exagear="$1"
enable_Pipelight="$1"
enable_Staging="$1"
@ -300,9 +299,6 @@ patch_enable ()
Compiler_Warnings)
enable_Compiler_Warnings="$2"
;;
Coverity)
enable_Coverity="$2"
;;
Exagear)
enable_Exagear="$2"
;;
@ -1871,18 +1867,6 @@ if test "$enable_Compiler_Warnings" -eq 1; then
) >> "$patchlist"
fi
# Patchset Coverity
# |
# | Modified files:
# | * dlls/ws2_32/socket.c
# |
if test "$enable_Coverity" -eq 1; then
patch_apply Coverity/0001-ws2_32-Fix-uninitialized-memory-access-in-do_poll-Co.patch
(
echo '+ { "Sebastian Lackner", "ws2_32: Fix uninitialized memory access in do_poll (Coverity).", 1 },';
) >> "$patchlist"
fi
# Patchset ws2_32-WriteWatches
# |
# | Modified files:
@ -1987,23 +1971,6 @@ if test "$enable_Staging" -eq 1; then
) >> "$patchlist"
fi
# Patchset server-Misc_ACL
# |
# | This patchset fixes the following Wine bugs:
# | * [#15980] GetSecurityInfo returns NULL DACL for process object
# |
# | Modified files:
# | * dlls/advapi32/tests/security.c, server/process.c, server/security.h, server/token.c
# |
if test "$enable_server_Misc_ACL" -eq 1; then
patch_apply server-Misc_ACL/0001-server-Add-default-security-descriptor-ownership-for.patch
patch_apply server-Misc_ACL/0002-server-Add-default-security-descriptor-DACL-for-proc.patch
(
echo '+ { "Erich E. Hoover", "server: Add default security descriptor ownership for processes.", 1 },';
echo '+ { "Erich E. Hoover", "server: Add default security descriptor DACL for processes.", 1 },';
) >> "$patchlist"
fi
# Patchset server-CreateProcess_ACLs
# |
# | This patchset fixes the following Wine bugs:
@ -2023,6 +1990,23 @@ if test "$enable_server_CreateProcess_ACLs" -eq 1; then
) >> "$patchlist"
fi
# Patchset server-Misc_ACL
# |
# | This patchset fixes the following Wine bugs:
# | * [#15980] GetSecurityInfo returns NULL DACL for process object
# |
# | Modified files:
# | * dlls/advapi32/tests/security.c, server/process.c, server/security.h, server/token.c
# |
if test "$enable_server_Misc_ACL" -eq 1; then
patch_apply server-Misc_ACL/0001-server-Add-default-security-descriptor-ownership-for.patch
patch_apply server-Misc_ACL/0002-server-Add-default-security-descriptor-DACL-for-proc.patch
(
echo '+ { "Erich E. Hoover", "server: Add default security descriptor ownership for processes.", 1 },';
echo '+ { "Erich E. Hoover", "server: Add default security descriptor DACL for processes.", 1 },';
) >> "$patchlist"
fi
# Patchset advapi32-LsaLookupSids
# |
# | Modified files: