Merge ~mitya57/compiz:format-truncation into compiz:master

[Dmitry Shachnev]

Increase string buffer size to fix GCC format-truncation error.

See failing build logs:

https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/4690/+build/22333766
https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/4690/+build/22333768

[Alberts Muktupāvels (muktupavels)]

review: Approve

[Sam Spilsbury (smspillaz)]

This can be merged IMO. Nice catch from the compiler side :-).

[Dmitry Shachnev (mitya57)]

It is not merged only because Ubuntu upload got stuck in proposed queue. I will try to use some force.

diff --git a/plugins/opengl/src/vertexbuffer.cpp b/plugins/opengl/src/vertexbuffer.cpp
index 4bcacfc..b102016 100644
--- a/plugins/opengl/src/vertexbuffer.cpp
+++ b/plugins/opengl/src/vertexbuffer.cpp
@@ -563,9 +563,9 @@ int PrivateVertexBuffer::render (const GLMatrix              *projection,
 
     for (int i = nTextures - 1; i >= 0; i--)
     {
-	char name[10];
+	char name[19];
 
-	snprintf (name, 10, "texCoord%d", i);
+	snprintf (name, 19, "texCoord%d", i);
 	texCoordIndex[i] = tmpProgram->attributeLocation (name);
 
 	(*GL::enableVertexAttribArray) (texCoordIndex[i]);
@@ -573,7 +573,7 @@ int PrivateVertexBuffer::render (const GLMatrix              *projection,
 	(*GL::vertexAttribPointer) (texCoordIndex[i], 2, GL_FLOAT, GL_FALSE, 0, 0);
 	(*GL::bindBuffer) (GL::ARRAY_BUFFER, 0);
 
-	snprintf (name, 9, "texture%d", i);
+	snprintf (name, 18, "texture%d", i);
 	tmpProgram->setUniform (name, i);
     }