Sebastian Lackner : wined3d: Avoid NULL pointer dereference when using GDI renderer.

[Alexandre Julliard]

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

Author: Sebastian Lackner <sebastian(a)fds-team.de>
Date:   Fri Jun 16 16:01:04 2017 +0200

wined3d: Avoid NULL pointer dereference when using GDI renderer.

Fixes a regression introduced in 62ca4f38269139ef2a8b9842ec538d9e7f7a0e76.

Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/wined3d/context.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
index 0f60542..fbc73ca 100644
--- a/dlls/wined3d/context.c
+++ b/dlls/wined3d/context.c
@@ -2703,12 +2703,13 @@ void context_bind_texture(struct wined3d_context *context, GLenum target, GLuint
 void *context_map_bo_address(struct wined3d_context *context,
         const struct wined3d_bo_address *data, size_t size, GLenum binding, DWORD flags)
 {
-    const struct wined3d_gl_info *gl_info = context->gl_info;
+    const struct wined3d_gl_info *gl_info;
     BYTE *memory;
 
     if (!data->buffer_object)
         return data->addr;
 
+    gl_info = context->gl_info;
     context_bind_bo(context, binding, data->buffer_object);
 
     if (gl_info->supported[ARB_MAP_BUFFER_RANGE])
@@ -2731,11 +2732,12 @@ void *context_map_bo_address(struct wined3d_context *context,
 void context_unmap_bo_address(struct wined3d_context *context,
         const struct wined3d_bo_address *data, GLenum binding)
 {
-    const struct wined3d_gl_info *gl_info = context->gl_info;
+    const struct wined3d_gl_info *gl_info;
 
     if (!data->buffer_object)
         return;
 
+    gl_info = context->gl_info;
     context_bind_bo(context, binding, data->buffer_object);
     GL_EXTCALL(glUnmapBuffer(binding));
     context_bind_bo(context, binding, 0);