x11drv: Prevent out of bound access in DescribePixelFormat.

433196d2 · Jan Zerebecki · Alexandre Julliard · f2c8a537 · 433196d2
Commit 433196d2 authored Mar 13, 2006 by Jan Zerebecki Committed by Alexandre Julliard Mar 14, 2006
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

opengl.c dlls/x11drv/opengl.c +3 -3

No files found.
--- a/dlls/x11drv/opengl.c
+++ b/dlls/x11drv/opengl.c
@@ -369,9 +369,9 @@ int X11DRV_DescribePixelFormat(X11DRV_PDEVICE *physDev,
    return 0;
  }

-  if (nCfgs < iPixelFormat) {
-    ERR("unexpected iPixelFormat(%d) > nFormats(%d), returns NULL\n", iPixelFormat, nCfgs);
-    return 0; /* unespected error */
+  if (nCfgs < iPixelFormat || 1 > iPixelFormat) {
+    WARN("unexpected iPixelFormat(%d): not >=1 and <=nFormats(%d), returning NULL\n", iPixelFormat, nCfgs);
+    return 0;
  }

  ret = nCfgs;