d3dx9: Fix potential memory leak on HeapReAlloc() failure in get_constants_desc().

Signed-off-by: Paul Gofman <gofmanp@gmail.com> Signed-off-by: Matteo Bruni <mbruni@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

d3dx9: Fix potential memory leak on HeapReAlloc() failure in get_constants_desc().
315e87e1 · Paul Gofman · Alexandre Julliard · d8723657 · 315e87e1
Commit 315e87e1 authored Jul 11, 2017 by Paul Gofman Committed by Alexandre Julliard Jul 18, 2017
Show whitespace changes
Inline Side-by-side

Showing with 10 additions and 6 deletions

preshader.c dlls/d3dx9_36/preshader.c +10 -6

No files found.
--- a/dlls/d3dx9_36/preshader.c
+++ b/dlls/d3dx9_36/preshader.c
@@ -698,16 +698,20 @@ static HRESULT get_constants_desc(unsigned int *byte_code, struct d3dx_const_tab
    }
    if (out->const_set_count)
    {
-        out->const_set = HeapReAlloc(GetProcessHeap(), 0, out->const_set,
+        struct d3dx_const_param_eval_output *new_alloc;
+        new_alloc = HeapReAlloc(GetProcessHeap(), 0, out->const_set,
                sizeof(*out->const_set) * out->const_set_count);
-        if (!out->const_set)
+        if (new_alloc)
        {
-            ERR("Out of memory.\n");
+            out->const_set = new_alloc;
-            hr = E_OUTOFMEMORY;
-            goto cleanup;
-        }
            out->const_set_size = out->const_set_count;
        }
+        else
+        {
+            WARN("Out of memory.\n");
+        }
+    }
 cleanup:
    ID3DXConstantTable_Release(ctab);
    return hr;