commit defa1c39acecbb1402ee23e1cda70d8b028956ff
author daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Tue May 18 18:51:45 2010 +0000
committer daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Tue May 18 18:51:45 2010 +0000
tree 309e4bed1712c90bf0cdc672c14b9045c6e3e46a
parent 91fd1de6bbc2543db9808e4614317b1b88373c30

Use plain data arrays for Buffer storage
TRAC #12299
Signed-off-by: Andrew Lewycky
Signed-off-by: Daniel Koch

Author:    Nicolas Capens

git-svn-id: https://angleproject.googlecode.com/svn/trunk@299 736b8ea6-26fd-11df-bfd4-992fa37f6226

src/libGLESv2/libGLESv2.cpp

diff --git a/src/libGLESv2/libGLESv2.cpp b/src/libGLESv2/libGLESv2.cpp
index b712d7c..4b91b2c 100644
--- a/src/libGLESv2/libGLESv2.cpp
+++ b/src/libGLESv2/libGLESv2.cpp
@@ -506,7 +506,7 @@
 
     try
     {
-        if (size < 0)
+        if (size < 0 || offset < 0)
         {
             return error(GL_INVALID_VALUE);
         }
@@ -539,12 +539,12 @@
                 return error(GL_INVALID_OPERATION);
             }
 
-            GLenum err = buffer->bufferSubData(data, size, offset);
-
-            if (err != GL_NO_ERROR)
+            if ((size_t)size + offset > buffer->size())
             {
-                return error(err);
+                return error(GL_INVALID_VALUE);
             }
+
+            buffer->bufferSubData(data, size, offset);
         }
     }
     catch(std::bad_alloc&)