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

server-device_manager_destroy: Remove patch set.

Browse Source 
This was fixed upstream by 0bd7da4290ea32da0dba92c0190e2fb839580c3d and 504cf18e19535759e75ce81db0909ba3136c9bfe.
This commit is contained in:
Zebediah Figura 2020-03-03 22:53:52 -06:00
parent 92b2688a74
commit 40e84b052b
3 changed files with 0 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
patches/patchinstall.sh
View File

@ -249,7 +249,6 @@ patch_enable_all ()
enable_server_Shared_Memory="$1"
enable_server_Signal_Thread="$1"
enable_server_Stored_ACLs="$1"
enable_server_device_manager_destroy="$1"
enable_setupapi_DiskSpaceList="$1"
enable_setupapi_SPFILENOTIFY_FILEINCABINET="$1"
enable_shdocvw_ParseURLFromOutsideSource_Tests="$1"
@ -861,9 +860,6 @@ patch_enable ()
server-Stored_ACLs)
enable_server_Stored_ACLs="$2"
;;
server-device_manager_destroy)
enable_server_device_manager_destroy="$2"
;;
setupapi-DiskSpaceList)
enable_setupapi_DiskSpaceList="$2"
;;
@ -5459,18 +5455,6 @@ if test "$enable_server_Registry_Notifications" -eq 1; then
) >> "$patchlist"
fi
# Patchset server-device_manager_destroy
# |
# | Modified files:
# | * server/device.c
# |
if test "$enable_server_device_manager_destroy" -eq 1; then
patch_apply server-device_manager_destroy/0001-server-Fix-crash-when-a-device-driver-segfaults-duri.patch
(
printf '%s\n' '+ { "Michael Müller", "server: Fix crash when a device driver segfaults during an open file request.", 1 },';
) >> "$patchlist"
fi
# Patchset setupapi-DiskSpaceList
# |
# | Modified files:

39
patches/server-device_manager_destroy/0001-server-Fix-crash-when-a-device-driver-segfaults-duri.patch
View File

@ -1,39 +0,0 @@
From bd0f7b022c161bf1c43bb9457925c0e1b45d0468 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sat, 27 May 2017 15:52:32 +0200
Subject: [PATCH] server: Fix crash when a device driver segfaults during an
open file request.
---
server/device.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/server/device.c b/server/device.c
index 5880ea620b9..9e250a8a9d3 100644
--- a/server/device.c
+++ b/server/device.c
@@ -667,7 +667,11 @@ static void delete_device( struct device *device )
if (!device->manager) return; /* already deleted */
LIST_FOR_EACH_ENTRY_SAFE( file, next, &device->files, struct device_file, entry )
+ {
+ grab_object( &file->obj );
delete_file( file );
+ release_object( &file->obj );
+ }
unlink_named_object( &device->obj );
list_remove( &device->entry );
@@ -705,7 +709,9 @@ static void device_manager_destroy( struct object *obj )
while ((ptr = list_head( &manager->devices )))
{
struct device *device = LIST_ENTRY( ptr, struct device, entry );
+ grab_object( &device->obj );
delete_device( device );
+ release_object( &device->obj );
}
while ((ptr = list_head( &manager->requests )))
--
2.20.1

1
patches/server-device_manager_destroy/definition
View File

@ -1 +0,0 @@
Fixes: Fix crash when a device driver segfaults during an open file request