diff options
| author | Juan A. Suarez Romero <jasuarez@igalia.com> | 2017-06-28 13:40:48 +0200 |
|---|---|---|
| committer | Juan A. Suarez Romero <jasuarez@igalia.com> | 2017-06-28 16:19:55 +0200 |
| commit | 89d4008ac85714bab8c49974377fd37970f6d66a (patch) | |
| tree | 9e940621f86d1256934f0b48c6863764e658d151 /src | |
| parent | 7bbcf3ac70933393dc9567e36a94fb4abc1748e7 (diff) | |
mesa: do not use format string as literal string
This fixes a couple of errors when building in Android:
external/mesa3d/src/mesa/main/shaderapi.c:293:49: error: format string
is not a string literal (potentially insecure)
[-Werror,-Wformat-security]
_mesa_error(ctx, GL_INVALID_OPERATION, caller);
^~~~~~
external/mesa3d/src/mesa/main/shaderapi.c:293:49: note: treat the string
as an argument to avoid this
_mesa_error(ctx, GL_INVALID_OPERATION, caller);
^
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/main/shaderapi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c index 0e46a09e7db..84189f0719f 100644 --- a/src/mesa/main/shaderapi.c +++ b/src/mesa/main/shaderapi.c @@ -290,7 +290,7 @@ attach_shader_err(struct gl_context *ctx, GLuint program, GLuint shader, * "The error INVALID_OPERATION is generated by AttachObjectARB * if <obj> is already attached to <containerObj>." */ - _mesa_error(ctx, GL_INVALID_OPERATION, caller); + _mesa_error(ctx, GL_INVALID_OPERATION, "%s", caller); return; } else if (same_type_disallowed && shProg->Shaders[i]->Stage == sh->Stage) { @@ -302,7 +302,7 @@ attach_shader_err(struct gl_context *ctx, GLuint program, GLuint shader, * is generated if [...] another shader object of the same type * as shader is already attached to program." */ - _mesa_error(ctx, GL_INVALID_OPERATION, caller); + _mesa_error(ctx, GL_INVALID_OPERATION, "%s", caller); return; } } |