mesa: do not use format string as literal string
authorJuan A. Suarez Romero <jasuarez@igalia.com>
Wed, 28 Jun 2017 11:40:48 +0000 (13:40 +0200)
committerJuan A. Suarez Romero <jasuarez@igalia.com>
Wed, 28 Jun 2017 14:19:55 +0000 (16:19 +0200)
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>
src/mesa/main/shaderapi.c

index 0e46a09e7db1a5d74f06ed3dea93e7e48e554928..84189f0719fd47db1a620b86ecfc2b033db3f152 100644 (file)
@@ -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;
       }
    }