sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

Fix a clear of an array allocated with alloca which had the wrong size

Browse source 
The array allocated for storing the difference flags for each layer in
cogl-pipeline-opengl.c was being cleared with the size of a pointer
instead of the size actually allocated for the array. Presumably this
would mean that if there is more than one layer it wouldn't clear the
array properly.

Also the size of the array was slightly wrong because it was allocating
the size of a pointer for each layer instead of the size of an
unsigned long.

This was originally reported by Jasper St. Pierre on #clutter.

Reviewed-by: Robert Bragg <robert@linux.intel.com>

(cherry picked from commit 1e134dd7cd5317651be158a483c7cb2723ce8869)
This commit is contained in:
Neil Roberts 2013-02-06 11:34:42 +00:00
parent 1ea8ee5932
commit 1e39819c49
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cogl/driver/gl/cogl-pipeline-opengl.c
View file

@ -1195,8 +1195,8 @@ _cogl_pipeline_flush_gl_state (CoglPipeline *pipeline,
if (n_layers) if (n_layers)
{ {
CoglPipelineCompareLayersState state; CoglPipelineCompareLayersState state;
layer_differences = g_alloca (sizeof (unsigned long *) * n_layers); layer_differences = g_alloca (sizeof (unsigned long) * n_layers);
memset (layer_differences, 0, sizeof (layer_differences)); memset (layer_differences, 0, sizeof (unsigned long) * n_layers);
state.i = 0; state.i = 0;
state.layer_differences = layer_differences; state.layer_differences = layer_differences;
_cogl_pipeline_foreach_layer_internal (pipeline, _cogl_pipeline_foreach_layer_internal (pipeline,