From 0c0260ec2de1cd9cff7f436d99a598e9a8f99ad8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20St=C3=B6neberg?= Date: Thu, 1 Jan 2015 15:02:21 +0100 Subject: [PATCH] "fixed" uninitialized memory usage/data race in osd_work_item_wait (nw) appears to be a Linux-only issue --- src/osd/sdl/sdlwork.c | 6 +++++- src/osd/windows/winwork.c | 8 ++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/osd/sdl/sdlwork.c b/src/osd/sdl/sdlwork.c index 58163ea8905..d5f42d91033 100644 --- a/src/osd/sdl/sdlwork.c +++ b/src/osd/sdl/sdlwork.c @@ -428,6 +428,11 @@ osd_work_item *osd_work_item_queue_multiple(osd_work_queue *queue, osd_work_call return NULL; item->event = NULL; item->queue = queue; + item->done = FALSE; + } + else + { + atomic_exchange32(&item->done, FALSE); // needs to be set this way to prevent data race/usage of uninitialized memory on Linux } // fill in the basics @@ -436,7 +441,6 @@ osd_work_item *osd_work_item_queue_multiple(osd_work_queue *queue, osd_work_call item->param = parambase; item->result = NULL; item->flags = flags; - atomic_exchange32(&item->done, FALSE); // advance to the next lastitem = item; diff --git a/src/osd/windows/winwork.c b/src/osd/windows/winwork.c index 6f3927585fd..97162fdaa23 100644 --- a/src/osd/windows/winwork.c +++ b/src/osd/windows/winwork.c @@ -438,6 +438,11 @@ osd_work_item *osd_work_item_queue_multiple(osd_work_queue *queue, osd_work_call return NULL; item->event = NULL; item->queue = queue; + item->done = FALSE; + } + else + { + atomic_exchange32(&item->done, FALSE); // needs to be set this way to prevent data race/usage of uninitialized memory on Linux } // fill in the basics @@ -445,8 +450,7 @@ osd_work_item *osd_work_item_queue_multiple(osd_work_queue *queue, osd_work_call item->callback = callback; item->param = parambase; item->result = NULL; - item->flags = flags; - atomic_exchange32(&item->done, FALSE); + item->flags = flags; // advance to the next lastitem = item;