Commit da6d12d0 by Jamie Madill Committed by Commit Bot

Fix out-of-bounds read in test.

The test wasn't reserving a large enough buffer when initializing the vertex data. Fix the test buffer limits. Bug: angleproject:4430 Change-Id: I4b9a98e1af1cc8088afb871816061d7ee4dd6a2c Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2079153Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent 698ffd02
...@@ -2530,7 +2530,7 @@ TEST_P(VertexAttributeTestES31, LargeStride) ...@@ -2530,7 +2530,7 @@ TEST_P(VertexAttributeTestES31, LargeStride)
RNG rng(0); RNG rng(0);
std::vector<Vertex> vertexData; std::vector<Vertex> vertexData(bufferSize, {Vector4(), Vector2()});
std::vector<GLColor> expectedColors; std::vector<GLColor> expectedColors;
for (uint32_t vertexIndex = 0; vertexIndex < numVertices; ++vertexIndex) for (uint32_t vertexIndex = 0; vertexIndex < numVertices; ++vertexIndex)
{ {
...@@ -2544,7 +2544,8 @@ TEST_P(VertexAttributeTestES31, LargeStride) ...@@ -2544,7 +2544,8 @@ TEST_P(VertexAttributeTestES31, LargeStride)
randomColor[3] = 255; randomColor[3] = 255;
Vector4 clampedVec = randomColor.toNormalizedVector(); Vector4 clampedVec = randomColor.toNormalizedVector();
vertexData.push_back({Vector4(x, y, 0.0f, 1.0f), Vector2(clampedVec[0], clampedVec[1])}); vertexData[vertexIndex] = {Vector4(x, y, 0.0f, 1.0f),
Vector2(clampedVec[0], clampedVec[1])};
expectedColors.push_back(randomColor); expectedColors.push_back(randomColor);
} }
...@@ -2552,6 +2553,8 @@ TEST_P(VertexAttributeTestES31, LargeStride) ...@@ -2552,6 +2553,8 @@ TEST_P(VertexAttributeTestES31, LargeStride)
glBindBuffer(GL_ARRAY_BUFFER, buffer); glBindBuffer(GL_ARRAY_BUFFER, buffer);
glBufferData(GL_ARRAY_BUFFER, bufferSize, vertexData.data(), GL_STATIC_DRAW); glBufferData(GL_ARRAY_BUFFER, bufferSize, vertexData.data(), GL_STATIC_DRAW);
vertexData.resize(numVertices);
constexpr char kVS[] = R"(#version 310 es constexpr char kVS[] = R"(#version 310 es
in vec4 pos; in vec4 pos;
in vec2 color; in vec2 color;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment