Henri Verbeet : d3d10: Initialise the type tree in D3D10CreateEffectFromMemory() (AFL).

[Alexandre Julliard]

Module: wine
Branch: master
Commit: c8ef7e835caacb807996a2beb0335ef6baf304dc
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c8ef7e835caacb807996a2beb0...

Author: Henri Verbeet 
Date:   Wed May 25 20:04:05 2016 +0200

d3d10: Initialise the type tree in D3D10CreateEffectFromMemory() (AFL).

Otherwise we'd crash if we failed parsing the effect before parse_fx10_body().

Signed-off-by: Henri Verbeet 
Signed-off-by: Alexandre Julliard

---

dlls/d3d10/d3d10_main.c | 23 +++++++++++++++++++++++
 dlls/d3d10/effect.c     | 22 ----------------------
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c
index 0f2af09..6ca75b6 100644
--- a/dlls/d3d10/d3d10_main.c
+++ b/dlls/d3d10/d3d10_main.c
@@ -199,6 +199,22 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D10_DRIVER
     return S_OK;
 }

+static int d3d10_effect_type_compare(const void *key, const struct wine_rb_entry *entry)
+{
+    const struct d3d10_effect_type *t = WINE_RB_ENTRY_VALUE(entry, const struct d3d10_effect_type, entry);
+    const DWORD *id = key;
+
+    return *id - t->id;
+}
+
+static const struct wine_rb_functions d3d10_effect_type_rb_functions =
+{
+    d3d10_rb_alloc,
+    d3d10_rb_realloc,
+    d3d10_rb_free,
+    d3d10_effect_type_compare,
+};
+
 HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT flags,
         ID3D10Device *device, ID3D10EffectPool *effect_pool, ID3D10Effect **effect)
 {
@@ -215,6 +231,13 @@ HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT fl
         return E_OUTOFMEMORY;
     }

+    if (wine_rb_init(&object->types, &d3d10_effect_type_rb_functions) == -1)
+    {
+        ERR("Failed to initialize type rbtree.\n");
+        HeapFree(GetProcessHeap(), 0, object);
+        return E_FAIL;
+    }
+
     object->ID3D10Effect_iface.lpVtbl = &d3d10_effect_vtbl;
     object->refcount = 1;
     ID3D10Device_AddRef(device);
diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c
index 1ce022b..6955445 100644
--- a/dlls/d3d10/effect.c
+++ b/dlls/d3d10/effect.c
@@ -2066,14 +2066,6 @@ static HRESULT parse_fx10_local_buffer(const char *data, size_t data_size,
     return S_OK;
 }

-static int d3d10_effect_type_compare(const void *key, const struct wine_rb_entry *entry)
-{
-    const struct d3d10_effect_type *t = WINE_RB_ENTRY_VALUE(entry, const struct d3d10_effect_type, entry);
-    const DWORD *id = key;
-
-    return *id - t->id;
-}
-
 static void d3d10_effect_type_member_destroy(struct d3d10_effect_type_member *typem)
 {
     TRACE("effect type member %p.\n", typem);
@@ -2110,26 +2102,12 @@ static void d3d10_effect_type_destroy(struct wine_rb_entry *entry, void *context
     HeapFree(GetProcessHeap(), 0, t);
 }

-static const struct wine_rb_functions d3d10_effect_type_rb_functions =
-{
-    d3d10_rb_alloc,
-    d3d10_rb_realloc,
-    d3d10_rb_free,
-    d3d10_effect_type_compare,
-};
-
 static HRESULT parse_fx10_body(struct d3d10_effect *e, const char *data, DWORD data_size)
 {
     const char *ptr = data + e->index_offset;
     unsigned int i;
     HRESULT hr;

-    if (wine_rb_init(&e->types, &d3d10_effect_type_rb_functions) == -1)
-    {
-        ERR("Failed to initialize type rbtree.\n");
-        return E_FAIL;
-    }
-
     if (!(e->local_buffers = d3d10_calloc(e->local_buffer_count, sizeof(*e->local_buffers))))
     {
         ERR("Failed to allocate local buffer memory.\n");