[PATCH] wined3d: Avoid accessing freed memory in wined3d_view_gl_destroy() (Valgrind).
Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 7e6f8a2817..634a0be36a 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4848,7 +4848,7 @@ static void wined3d_view_gl_destroy(struct wined3d_device *device, ctx->free = ctx != &c ? ctx : NULL; wined3d_cs_destroy_object(device->cs, wined3d_view_gl_destroy_object, ctx); - if (!ctx->free) + if (ctx == &c) device->cs->ops->finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); } -- 2.24.0
Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> --- This fixes a crash on my system. dlls/ddraw/tests/ddraw1.c | 2 +- dlls/ddraw/tests/ddraw2.c | 2 +- dlls/ddraw/tests/ddraw4.c | 2 +- dlls/ddraw/tests/ddraw7.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 16c0cfb4e5..45a24e3ffb 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -1254,8 +1254,8 @@ static void test_coop_level_threaded(void) hr = IDirectDraw_SetCooperativeLevel(ddraw, p.window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); - IDirectDraw_Release(ddraw); destroy_window_thread(&p); + IDirectDraw_Release(ddraw); } static ULONG get_refcount(IUnknown *test_iface) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index f0ae458d85..3fccd02f1e 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -1142,8 +1142,8 @@ static void test_coop_level_threaded(void) hr = IDirectDraw2_SetCooperativeLevel(ddraw, p.window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); - IDirectDraw2_Release(ddraw); destroy_window_thread(&p); + IDirectDraw2_Release(ddraw); } static void test_depth_blit(void) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index b6cb97c3c9..d97834e542 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -1314,8 +1314,8 @@ static void test_coop_level_threaded(void) hr = IDirectDraw4_SetCooperativeLevel(ddraw, p.window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); - IDirectDraw4_Release(ddraw); destroy_window_thread(&p); + IDirectDraw4_Release(ddraw); } static void test_depth_blit(void) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 0afbe76b6c..bbc61087ca 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -1268,8 +1268,8 @@ static void test_coop_level_threaded(void) hr = IDirectDraw7_SetCooperativeLevel(ddraw, p.window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); - IDirectDraw7_Release(ddraw); destroy_window_thread(&p); + IDirectDraw7_Release(ddraw); } static void test_depth_blit(void) -- 2.24.0
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=64322 Your paranoid android. === w864 (64 bit report) === ddraw: ddraw1.c:3010: Test failed: Failed to create surface, hr 0x887601c2. 0cb8:ddraw1: unhandled exception c0000005 at 0000000000439435 === w8adm (32 bit report) === ddraw: ddraw2.c:3260: Test failed: Got unexpected hr 0x887601c2. === w864 (32 bit report) === ddraw: 0330:ddraw2: unhandled exception c0000005 at 73FD3599 === wvistau64 (32 bit report) === ddraw: 0284:ddraw4: unhandled exception c0000005 at 73DE6143 === wvistau64 (64 bit report) === ddraw: 0284:ddraw4: unhandled exception c0000005 at 000007FEF6301883 === wvistau64 (32 bit report) === ddraw: 0914:ddraw7: unhandled exception c0000005 at 73DE6143 === wvistau64 (64 bit report) === ddraw: 02d8:ddraw7: unhandled exception c0000005 at 000007FEF6301883
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> On 2/2/20 5:45 AM, Sven Baars wrote:
Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 7e6f8a2817..634a0be36a 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4848,7 +4848,7 @@ static void wined3d_view_gl_destroy(struct wined3d_device *device, ctx->free = ctx != &c ? ctx : NULL;
wined3d_cs_destroy_object(device->cs, wined3d_view_gl_destroy_object, ctx); - if (!ctx->free) + if (ctx == &c) device->cs->ops->finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); }
----------------------------------------------------------------------------------- This email message is for the sole use of the intended recipient(s) and may contain confidential information. Any unauthorized review, use, disclosure or distribution is prohibited. If you are not the intended recipient, please contact the sender by reply email and destroy all copies of the original message. -----------------------------------------------------------------------------------
participants (4)
-
Henri Verbeet -
Liam Middlebrook -
Marvin -
Sven Baars