AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: errors: validate the length of null terminated string

Browse Source 
We're about to rework the meaning of gl_debug_message::length to only
store the user provided data. Thus we should add an explicit validation
for null terminated strings.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Timothy Arceri <timothy.arceri@collabora.com>
This commit is contained in:
Emil Velikov
2015-11-26 00:36:16 +00:00
parent 66fea8bd96
commit 622186fbdf
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/main/errors.c
+17 -3
View File
@@ -960,8 +960,22 @@ error:
static GLboolean
validate_length(struct gl_context *ctx, const char *callerstr, GLsizei length)
validate_length(struct gl_context *ctx, const char *callerstr, GLsizei length,
const GLchar *buf)
{
if (length < 0) {
GLsizei len = strlen(buf);
if (len >= MAX_DEBUG_MESSAGE_LENGTH) {
_mesa_error(ctx, GL_INVALID_VALUE,
"%s(null terminated string length=%d, is not less than "
"GL_MAX_DEBUG_MESSAGE_LENGTH=%d)", callerstr, len,
MAX_DEBUG_MESSAGE_LENGTH);
return GL_FALSE;
}
}
if (length >= MAX_DEBUG_MESSAGE_LENGTH) {
_mesa_error(ctx, GL_INVALID_VALUE,
"%s(length=%d, which is not less than "
@@ -992,7 +1006,7 @@ _mesa_DebugMessageInsert(GLenum source, GLenum type, GLuint id,
if (length < 0)
length = strlen(buf);
if (!validate_length(ctx, callerstr, length))
if (!validate_length(ctx, callerstr, length, buf))
return; /* GL_INVALID_VALUE */
log_msg(ctx, gl_enum_to_debug_source(source),
@@ -1161,7 +1175,7 @@ _mesa_PushDebugGroup(GLenum source, GLuint id, GLsizei length,
if (length < 0)
length = strlen(message);
if (!validate_length(ctx, callerstr, length))
if (!validate_length(ctx, callerstr, length, message))
return; /* GL_INVALID_VALUE */
debug = _mesa_lock_debug_state(ctx);