coverity check bug fix going over end of array

[mesa.git] / src / mesa / drivers / svga / svgamesa24.c

diff --git a/src/mesa/drivers/svga/svgamesa24.c b/src/mesa/drivers/svga/svgamesa24.c
index 0d0c8e74c8f8177cc0df5f96d4cf77a78f87854d..07491cc67ac3f006e739897b31d4b296cbf7a490 100644 (file)
--- a/src/mesa/drivers/svga/svgamesa24.c
+++ b/src/mesa/drivers/svga/svgamesa24.c
@@ -1,9 +1,9 @@
-/* $Id: svgamesa24.c,v 1.9 2001/01/24 00:04:59 brianp Exp $ */
+/* $Id: svgamesa24.c,v 1.12 2002/11/11 18:42:41 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.3
- * Copyright (C) 1995-2000  Brian Paul
+ * Version:  5.0
+ * Copyright (C) 1995-2002  Brian Paul
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -35,6 +35,7 @@
 
 #include "svgapix.h"
 #include "svgamesa24.h"
+#include "swrast/swrast.h"
 
 
 #if 0
@@ -78,16 +79,20 @@ static unsigned long __svga_getpixel24(int x, int y)
     return rgbBuffer[offset].r<<16 | rgbBuffer[offset].g<<8 | rgbBuffer[offset].b;
 }
 
-void __clear_color24( GLcontext *ctx, const GLchan color[4] )
+void __clear_color24( GLcontext *ctx, const GLfloat color[4] )
 {
-   SVGAMesa->clear_red = color[0];
-   SVGAMesa->clear_green = color[1];
-   SVGAMesa->clear_blue = color[2];
+   GLubyte col[3];
+   CLAMPED_FLOAT_TO_UBYTE(col[0], color[0]);
+   CLAMPED_FLOAT_TO_UBYTE(col[1], color[1]);
+   CLAMPED_FLOAT_TO_UBYTE(col[2], color[2]);
+   SVGAMesa->clear_red = col[0];
+   SVGAMesa->clear_green = col[1];
+   SVGAMesa->clear_blue = col[2];
 /*   SVGAMesa->clear_truecolor = red<<16 | green<<8 | blue; */
 }
 
-GLbitfield __clear24( GLcontext *ctx, GLbitfield mask, GLboolean all,
-                      GLint x, GLint y, GLint width, GLint height )
+void __clear24( GLcontext *ctx, GLbitfield mask, GLboolean all,
+                GLint x, GLint y, GLint width, GLint height )
 {
    int i,j;
    
@@ -110,6 +115,7 @@ GLbitfield __clear24( GLcontext *ctx, GLbitfield mask, GLboolean all,
                                    SVGAMesa->clear_blue);
          SVGABuffer.DrawBuffer = tmp;
       }        
+      mask &= ~DD_FRONT_LEFT_BIT;
    }
    if (mask & DD_BACK_LEFT_BIT) {
       if (all) {
@@ -130,8 +136,11 @@ GLbitfield __clear24( GLcontext *ctx, GLbitfield mask, GLboolean all,
                                    SVGAMesa->clear_blue);
          SVGABuffer.DrawBuffer = tmp;
       }        
+      mask &= ~DD_BACK_LEFT_BIT;
    }
-   return mask & (~(DD_FRONT_LEFT_BIT | DD_BACK_LEFT_BIT));
+
+   if (mask)
+      _swrast_Clear( ctx, mask, all, x, y, width, height );
 }
 
 void __write_rgba_span24( const GLcontext *ctx, GLuint n, GLint x, GLint y,