commit d4620a36311fc87edd1685af98aca00097f0db75
author daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Sun Mar 21 04:31:28 2010 +0000
committer daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Sun Mar 21 04:31:28 2010 +0000
tree 15bfac9cf6cb1421bd6f8e6ef99bf5ff9eed8ebf
parent 159acdf5f6370e89f3deda77cd3752ad11d3f76c

Don't crash on a null pointer passed to glBufferData

TRAC #11528

 * Initialise buffer to 0 if BufferData is called with data = NULL
   (special case: if not resizing, just leave the old data in place).
 * BufferSubData ignores calls with data = NULL
 * Replace Buffer::data_t with GLubyte.

Author:    Andrew Lewycky
Signed-off-by: Shannon Woods
Signed-off-by: Daniel Koch

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

src/libGLESv2/Buffer.cpp

diff --git a/src/libGLESv2/Buffer.cpp b/src/libGLESv2/Buffer.cpp
index c6972d2..5661b89 100644
--- a/src/libGLESv2/Buffer.cpp
+++ b/src/libGLESv2/Buffer.cpp
@@ -34,13 +34,22 @@
 {
     if (size < 0) return GL_INVALID_VALUE;
 
-    const data_t* newdata = static_cast<const data_t*>(data);
+    const GLubyte* newdata = static_cast<const GLubyte*>(data);
 
     if (size != mContents.size())
     {
         // vector::resize only provides the basic exception guarantee, so use temporaries & swap to get the strong exception guarantee.
         // We don't want to risk having mContents and mIdentityTranslation that have different contents or even different sizes.
-        std::vector<data_t> newContents(newdata, newdata + size);
+        std::vector<GLubyte> newContents;
+
+        if (newdata != NULL)
+        {
+            newContents.assign(newdata, newdata + size);
+        }
+        else
+        {
+            newContents.assign(size, 0);
+        }
 
         TranslatedVertexBuffer *newIdentityTranslation = mBackEnd->createVertexBuffer(size);
 
@@ -51,9 +60,8 @@
         delete mIdentityTranslation;
         mIdentityTranslation = newIdentityTranslation;
     }
-    else
+    else if (newdata != NULL)
     {
-        const data_t* newdata = static_cast<const data_t*>(data);
         mContents.assign(newdata, newdata + size);
     }
 
@@ -66,7 +74,7 @@
     if (std::numeric_limits<GLsizeiptr>::max() - offset < size) return GL_INVALID_VALUE;
     if (size + offset > static_cast<GLsizeiptr>(mContents.size())) return GL_INVALID_VALUE;
 
-    const data_t *newdata = static_cast<const data_t*>(data);
+    const GLubyte *newdata = static_cast<const GLubyte*>(data);
     copy(newdata, newdata + size, mContents.begin() + offset);
 
     return copyToIdentityBuffer(offset, size);
@@ -77,7 +85,7 @@
     ASSERT(offset >= 0 && length >= 0);
 
     // This is a stalling map. Not great for performance.
-    data_t *p = static_cast<data_t*>(mIdentityTranslation->map());
+    GLubyte *p = static_cast<GLubyte*>(mIdentityTranslation->map());
 
     memcpy(p + offset, &mContents[0] + offset, length);
     mIdentityTranslation->unmap();