From a2c0d2bb37244d1bece3ddd411981aaf06f3c842 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Fri, 16 Jun 2017 16:01:04 +0200 Subject: [PATCH] wined3d: Avoid NULL pointer dereference when using GDI renderer. Fixes a regression introduced in 62ca4f38269139ef2a8b9842ec538d9e7f7a0e76. Signed-off-by: Sebastian Lackner Signed-off-by: Henri Verbeet Signed-off-by: Alexandre Julliard --- 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 0f6054226b7..fbc73ca9a1e 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); -- 2.11.4.GIT