Alex Henrie : ddraw: Don' t crash if writing out a new ddraw1 surface segfaults.

[Alexandre Julliard]

Module: wine
Branch: stable
Commit: f515b99ab45b32aea7c2cbe225387d0872e01929
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f515b99ab45b32aea7c2cbe225...

Author: Alex Henrie <alexhenrie24(a)gmail.com>
Date:   Sat Jan 28 15:34:03 2017 -0700

ddraw: Don't crash if writing out a new ddraw1 surface segfaults.

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
(cherry picked from commit d9f2b4627af575ebcd28395d9ba3744cab6c5f36)
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>

---

 dlls/ddraw/ddraw.c        | 22 ++++++++++++++++------
 dlls/ddraw/tests/ddraw1.c |  2 ++
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
index 3b4c628..ecc0a46 100644
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -26,6 +26,8 @@
 
 #include "ddraw_private.h"
 
+#include "wine/exception.h"
+
 WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
 
 static const struct ddraw *exclusive_ddraw;
@@ -2977,14 +2979,22 @@ static HRESULT WINAPI ddraw1_CreateSurface(IDirectDraw *iface,
     DDSD_to_DDSD2(surface_desc, &surface_desc2);
     hr = ddraw_surface_create(ddraw, &surface_desc2, &impl, outer_unknown, 1);
     wined3d_mutex_unlock();
-    if (FAILED(hr))
+
+    __TRY
     {
-        *surface = NULL;
-        return hr;
+        if (FAILED(hr))
+        {
+            *surface = NULL;
+            break;
+        }
+        *surface = &impl->IDirectDrawSurface_iface;
+        impl->ifaceToRelease = NULL;
     }
-
-    *surface = &impl->IDirectDrawSurface_iface;
-    impl->ifaceToRelease = NULL;
+    __EXCEPT_PAGE_FAULT
+    {
+        hr = E_INVALIDARG;
+    }
+    __ENDTRY;
 
     return hr;
 }
diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c
index ed4c5ec..ff88b74 100644
--- a/dlls/ddraw/tests/ddraw1.c
+++ b/dlls/ddraw/tests/ddraw1.c
@@ -1967,6 +1967,8 @@ static void test_surface_qi(void)
     surface_desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE;
     surface_desc.dwWidth = 512;
     surface_desc.dwHeight = 512;
+    hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, (IDirectDrawSurface **)0xdeadbeef, NULL);
+    ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
     hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &surface, NULL);
     ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);