Changeset 2977 for trunk/src

Timestamp:

Mar 3, 2000, 12:09:21 AM (25 years ago)

Author:

sandervl

Message:

check for null pointer in wglSetPixelFormat

Location:

trunk/src/opengl/mesa

Files:

• 3dfx/fxwgl.c (modified) (1 diff)
• wgl.c (modified) (4 diffs)

trunk/src/opengl/mesa/3dfx/fxwgl.c

@@ -797 +797 @@
   qt_valid_pix = qt_pix;
 
+#ifdef __WIN32OS2__
+  if(iPixelFormat < 1 || iPixelFormat > qt_valid_pix || (ppfd && ppfd->nSize != sizeof(PIXELFORMATDESCRIPTOR))) {
+#else
   if(iPixelFormat < 1 || iPixelFormat > qt_valid_pix || ppfd->nSize != sizeof(PIXELFORMATDESCRIPTOR)) {
+#endif
     SetLastError(0);
     return(FALSE);

trunk/src/opengl/mesa/wgl.c

@@ -1 @@
-/* $Id: wgl.c,v 1.2 2000-03-01 18:49:40 jeroen Exp $ */
+/* $Id: wgl.c,v 1.3 2000-03-02 23:09:21 sandervl Exp $ */
 
 /*
@@ -396 +396 @@
 
     qt_valid_pix = qt_pix;
-    if(ppfd->nSize != sizeof(PIXELFORMATDESCRIPTOR) || ppfd->nVersion != 1)
+//    if(ppfd->nSize != sizeof(PIXELFORMATDESCRIPTOR) || ppfd->nVersion != 1)
+    if(ppfd->nSize != sizeof(PIXELFORMATDESCRIPTOR))
     {
         SetLastError(0);
@@ -466 +467 @@
 GLAPI PROC GLWINAPI wglGetProcAddress(LPCSTR lpszProc)
 {
-    int         i;
+    int i;
     for(i = 0;i < qt_ext;i++)
         if(!strcmp(lpszProc,ext[i].name))
@@ -491 +492 @@
 
     qt_valid_pix = qt_pix;
+#ifdef __WIN32OS2__
+    if(iPixelFormat < 1 || iPixelFormat > qt_valid_pix || (ppfd && ppfd->nSize != sizeof(PIXELFORMATDESCRIPTOR)))
+#else
     if(iPixelFormat < 1 || iPixelFormat > qt_valid_pix || ppfd->nSize != sizeof(PIXELFORMATDESCRIPTOR))
+#endif
     {
         SetLastError(0);