diff options
| author | Nicolai Hähnle <[email protected]> | 2017-02-22 14:00:29 +0100 |
|---|---|---|
| committer | Andres Gomez <[email protected]> | 2017-03-29 19:13:17 +0300 |
| commit | 27a3fe0008e95f1dadccd1bf6cb70796b1f4b28b (patch) | |
| tree | 93d2d20400fe2c2677d0821532063a2e5811e50e /src/mesa | |
| parent | 0ecda185de538672d4a7665af2a3d4b5f5c1b7cf (diff) | |
mesa/main: fix MultiDrawElements[BaseVertex] validation of primcount
primcount must be a GLsizei as in the signature for MultiDrawElements
or bad things can happen.
Furthermore, an error should be flagged when primcount is negative.
Curiously, this code used to work somewhat correctly even when primcount
was negative, because the loop that checks count[i] would iterate out of
bounds and almost certainly hit a negative value at some point.
Found by an ASAN error in
GL45-CTS.gtf32.GL3Tests.draw_elements_base_vertex.draw_elements_base_vertex_primcount
Note that the OpenGL spec seems to have s/primcount/drawcount/ at some
point, and the code still reflects the old language.
v2: provide the correct spec quotes (pointed out by Ian)
Cc: [email protected]
Reviewed-by: Marek Olšák <[email protected]> (v1)
Reviewed-by: Ian Romanick <[email protected]>
(cherry picked from commit c11dcfb5e9b051b9036949b3e40a9dc15138bd97)
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/main/api_validate.c | 24 | ||||
| -rw-r--r-- | src/mesa/main/api_validate.h | 2 |
2 files changed, 23 insertions, 3 deletions
diff --git a/src/mesa/main/api_validate.c b/src/mesa/main/api_validate.c index 52c721a383f..99004a99297 100644 --- a/src/mesa/main/api_validate.c +++ b/src/mesa/main/api_validate.c @@ -716,12 +716,32 @@ GLboolean _mesa_validate_MultiDrawElements(struct gl_context *ctx, GLenum mode, const GLsizei *count, GLenum type, const GLvoid * const *indices, - GLuint primcount) + GLsizei primcount) { - unsigned i; + GLsizei i; FLUSH_CURRENT(ctx, 0); + /* + * Section 2.3.1 (Errors) of the OpenGL 4.5 (Core Profile) spec says: + * + * "If a negative number is provided where an argument of type sizei or + * sizeiptr is specified, an INVALID_VALUE error is generated." + * + * and in the same section: + * + * "In other cases, there are no side effects unless otherwise noted; + * the command which generates the error is ignored so that it has no + * effect on GL state or framebuffer contents." + * + * Hence, check both primcount and all the count[i]. + */ + if (primcount < 0) { + _mesa_error(ctx, GL_INVALID_VALUE, + "glMultiDrawElements(primcount=%d)", primcount); + return GL_FALSE; + } + for (i = 0; i < primcount; i++) { if (count[i] < 0) { _mesa_error(ctx, GL_INVALID_VALUE, diff --git a/src/mesa/main/api_validate.h b/src/mesa/main/api_validate.h index e94f02e4ba5..de520c98dcb 100644 --- a/src/mesa/main/api_validate.h +++ b/src/mesa/main/api_validate.h @@ -57,7 +57,7 @@ extern GLboolean _mesa_validate_MultiDrawElements(struct gl_context *ctx, GLenum mode, const GLsizei *count, GLenum type, const GLvoid * const *indices, - GLuint primcount); + GLsizei primcount); extern GLboolean _mesa_validate_DrawRangeElements(struct gl_context *ctx, GLenum mode, |