From: Kenneth Graunke <kenneth@whitecape.org>
Date: Sat, 9 Jun 2012 05:12:23 +0000 (-0700)
Subject: mesa: Check for a negative "size" parameter in glCopyBufferSubData().
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a75e704326986b85539b6abf2319701e1a3138e9;p=mesa.git

mesa: Check for a negative "size" parameter in glCopyBufferSubData().

From the GL_ARB_copy_buffer spec:
"An INVALID_VALUE error is generated if any of readoffset, writeoffset,
 or size are negative [...]"

Fixes oglconform's copybuffer/negative.CNNegativeValues test.

NOTE: This is a candidate for stable release branches.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
---

diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 54156650974..846260d80fe 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -1360,6 +1360,12 @@ _mesa_CopyBufferSubData(GLenum readTarget, GLenum writeTarget,
       return;
    }
 
+   if (size < 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glCopyBufferSubData(writeOffset = %d)", (int) size);
+      return;
+   }
+
    if (readOffset + size > src->Size) {
       _mesa_error(ctx, GL_INVALID_VALUE,
                   "glCopyBufferSubData(readOffset + size = %d)",