GithubStar/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2026-10-29 07:06:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

cocoa: remove possible use after free

Browse Source
This commit is contained in:
Stefano Pigozzi
2015-03-07 09:13:05 +01:00
parent c66b51dab0
commit 5cddd4ccca
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
video/out/cocoa_common.m
+5 -5
View File
@@ -93,9 +93,8 @@ struct vo_cocoa_state {
void (*resize_redraw)(struct vo *vo, int w, int h);
};
static void with_cocoa_lock(struct vo *vo, void(^block)(void))
static void with_cocoa_lock(struct vo_cocoa_state *s, void(^block)(void))
{
struct vo_cocoa_state *s = vo->cocoa;
cocoa_lock(s);
block();
cocoa_unlock(s);
@@ -103,8 +102,9 @@ static void with_cocoa_lock(struct vo *vo, void(^block)(void))
static void with_cocoa_lock_on_main_thread(struct vo *vo, void(^block)(void))
{
struct vo_cocoa_state *s = vo->cocoa;
dispatch_async(dispatch_get_main_queue(), ^{
with_cocoa_lock(vo, block);
with_cocoa_lock(s, block);
});
}
@@ -240,8 +240,8 @@ int vo_cocoa_init(struct vo *vo)
.embedded = vo->opts->WinID >= 0,
};
mpthread_mutex_init_recursive(&s->mutex);
cocoa_init_light_sensor(vo);
vo->cocoa = s;
cocoa_init_light_sensor(vo);
return 1;
}
@@ -714,7 +714,7 @@ int vo_cocoa_control(struct vo *vo, int *events, int request, void *arg)
return vo_cocoa_ontop(vo);
case VOCTRL_GET_UNFS_WINDOW_SIZE: {
int *s = arg;
with_cocoa_lock(vo, ^{
with_cocoa_lock(vo->cocoa, ^{
NSSize size = [vo->cocoa->view frame].size;
s[0] = size.width;
s[1] = size.height;