2 May
2024
2 May
'24
11:23 p.m.
ObjC dictionary literals are autoreleased, meaning BitmapOutputTypeMap was released at the
end of the first call to macdrv_copy_pasteboard_types. Any call after that was liable to
crash, depending on whether it was overwritten. More complex objects on the clipboard
(like a file copied in the Finder) seemed to trigger a crash, which manifested as
explorer.exe taking 100% of CPU (since the main thread crashed, then the SEGV handler
crashed because it's not a Wine thread).
Fixes a regression from bb2e02ab66c5c602d635722cf3a5820d6b366006.
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/5572
2 May
2 May
11:23 p.m.
New subject: [PATCH 1/1] winemac.drv: Fix use-after-free in macdrv_copy_pasteboard_types.
From: Brendan Shanks <bshanks(a)codeweavers.com>
Fixes a regression from bb2e02ab66c5c602d635722cf3a5820d6b366006.
---
dlls/winemac.drv/cocoa_clipboard.m | 1 +
1 file changed, 1 insertion(+)
diff --git a/dlls/winemac.drv/cocoa_clipboard.m b/dlls/winemac.drv/cocoa_clipboard.m
index a3dca323705..4994442f1df 100644
--- a/dlls/winemac.drv/cocoa_clipboard.m
+++ b/dlls/winemac.drv/cocoa_clipboard.m
@@ -103,6 +103,7 @@ CFArrayRef macdrv_copy_pasteboard_types(CFTypeRef pasteboard)
@"com.compuserve.gif" : @(NSBitmapImageFileTypeGIF),
@"public.jpeg" : @(NSBitmapImageFileTypeJPEG),
};
+ [BitmapOutputTypeMap retain];
});
OnMainThread(^{
--
GitLab
https://gitlab.winehq.org/wine/wine/-/merge_requests/5572
16
days inactive
16
days old
1 comments
2 participants
participants (2)
-
Brendan Shanks -
Brendan Shanks (＠bshanks)