ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wgl: Fix piAttributes NULL crash.

This commit is contained in:
Roderick Colenbrander 2007-01-04 00:15:54 +01:00 committed by Alexandre Julliard
parent 7c95df77ae
commit e4eac235f1
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/winex11.drv/opengl.c
View File

@ -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,
} }
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: {