Commit e4eac235 authored by Roderick Colenbrander's avatar Roderick Colenbrander Committed by Alexandre Julliard

wgl: Fix piAttributes NULL crash.

parent 7c95df77
...@@ -605,6 +605,10 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, Wine_GLPBuf ...@@ -605,6 +605,10 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, Wine_GLPBuf
int wantColorBits = 0; int wantColorBits = 0;
int sz_alpha = 0; int sz_alpha = 0;
/* The list of WGL attributes is allowed to be NULL, so don't return -1 (error) but just 0 */
if(iWGLAttr == NULL)
return 0;
while (0 != iWGLAttr[cur]) { while (0 != iWGLAttr[cur]) {
TRACE("pAttr[%d] = %x\n", cur, iWGLAttr[cur]); TRACE("pAttr[%d] = %x\n", cur, iWGLAttr[cur]);
...@@ -1963,7 +1967,7 @@ static HPBUFFERARB WINAPI X11DRV_wglCreatePbufferARB(HDC hdc, int iPixelFormat, ...@@ -1963,7 +1967,7 @@ static HPBUFFERARB WINAPI X11DRV_wglCreatePbufferARB(HDC hdc, int iPixelFormat,
} }
PUSH2(attribs, GLX_PBUFFER_WIDTH, iWidth); PUSH2(attribs, GLX_PBUFFER_WIDTH, iWidth);
PUSH2(attribs, GLX_PBUFFER_HEIGHT, iHeight); PUSH2(attribs, GLX_PBUFFER_HEIGHT, iHeight);
while (0 != *piAttribList) { while (piAttribList && 0 != *piAttribList) {
int attr_v; int attr_v;
switch (*piAttribList) { switch (*piAttribList) {
case WGL_TEXTURE_FORMAT_ARB: { case WGL_TEXTURE_FORMAT_ARB: {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment