[PATCH v4 3/4] ddraw: Don't crash if writing out a new ddraw4 surface segfaults.
Alex Henrie
alexhenrie24 at gmail.com
Sat Jan 28 16:34:05 CST 2017
Signed-off-by: Alex Henrie <alexhenrie24 at gmail.com>
---
dlls/ddraw/ddraw.c | 22 +++++++++++++++-------
dlls/ddraw/tests/ddraw4.c | 2 ++
2 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
index 1e69df4f89..ebb27066c8 100644
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -2868,15 +2868,23 @@ static HRESULT WINAPI ddraw4_CreateSurface(IDirectDraw4 *iface,
hr = ddraw_surface_create(ddraw, surface_desc, &impl, outer_unknown, 4);
wined3d_mutex_unlock();
- if (FAILED(hr))
+
+ __TRY
{
- *surface = NULL;
- return hr;
+ if (FAILED(hr))
+ {
+ *surface = NULL;
+ break;
+ }
+ *surface = &impl->IDirectDrawSurface4_iface;
+ IDirectDraw4_AddRef(iface);
+ impl->ifaceToRelease = (IUnknown *)iface;
}
-
- *surface = &impl->IDirectDrawSurface4_iface;
- IDirectDraw4_AddRef(iface);
- impl->ifaceToRelease = (IUnknown *)iface;
+ __EXCEPT_PAGE_FAULT
+ {
+ hr = E_INVALIDARG;
+ }
+ __ENDTRY;
return hr;
}
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index 1ace50ab42..3aec876854 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -2267,6 +2267,8 @@ static void test_surface_qi(void)
surface_desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE;
surface_desc.dwWidth = 512;
surface_desc.dwHeight = 512;
+ hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, (IDirectDrawSurface4 **)0xdeadbeef, NULL);
+ ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &surface, NULL);
ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
--
2.11.0
More information about the wine-patches
mailing list