ddraw: Release only valid texture parents on ddraw_texture_init failure.

When ddraw_texture_init needs to clean up on failure, it will call the wined3d_texture_get_sub_resource_parent function on draw_texture in order to retrieve its parent for a IDirectDrawSurface release call. However, if draw_texture is NULL, then the function call will crash due to a null pointer dereference. Therefore, on failure cleanup, the release operation on the texture parent should only be performed if draw_texture is not NULL. This fixes a crash in the Virtual Insanity game demo.

ddraw: Release only valid texture parents on ddraw_texture_init failure.
1600f2e6 · Andrew Nguyen · Alexandre Julliard · 72fd6e92 · 1600f2e6
Commit 1600f2e6 authored Mar 13, 2024 by Andrew Nguyen Committed by Alexandre Julliard Mar 15, 2024
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 7 deletions

surface.c dlls/ddraw/surface.c +9 -7

No files found.
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -6519,15 +6519,17 @@ static HRESULT ddraw_texture_init(struct ddraw_texture *texture, struct ddraw *d

 fail:
    if (draw_texture)
+    {
        wined3d_texture_decref(draw_texture);

-    parent = wined3d_texture_get_sub_resource_parent(draw_texture, 0);
-    if (texture->version == 7)
-        IDirectDrawSurface7_Release(&parent->IDirectDrawSurface7_iface);
-    else if (texture->version == 4)
-        IDirectDrawSurface4_Release(&parent->IDirectDrawSurface4_iface);
-    else
-        IDirectDrawSurface_Release(&parent->IDirectDrawSurface_iface);
+        parent = wined3d_texture_get_sub_resource_parent(draw_texture, 0);
+        if (texture->version == 7)
+            IDirectDrawSurface7_Release(&parent->IDirectDrawSurface7_iface);
+        else if (texture->version == 4)
+            IDirectDrawSurface4_Release(&parent->IDirectDrawSurface4_iface);
+        else
+            IDirectDrawSurface_Release(&parent->IDirectDrawSurface_iface);
+    }
    return hr;
 }