summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Lespiau <damien.lespiau@intel.com>2011-07-12 14:53:57 +0100
committerDamien Lespiau <damien.lespiau@intel.com>2011-07-12 14:53:57 +0100
commited3004816e3fe81f3705f8cb469956ebf319ec32 (patch)
tree3e21ae1188319022e03368cecfc6275789ca86c4
parentc72afc27c67df5a9f0d8b0d0c4768b4386fe687b (diff)
downloadclutter-ed3004816e3fe81f3705f8cb469956ebf319ec32.tar.gz
pipeline: NULLify deprecated_get_layers_list on copy
That list is tracking the layers for get_layers_list() and needs to be freed later on. However _copy() did not initialize it and we ended up trying to free some garbage pointer. Cherry picked from Cogl master 221850ec
-rw-r--r--clutter/cogl/cogl/cogl-pipeline.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/clutter/cogl/cogl/cogl-pipeline.c b/clutter/cogl/cogl/cogl-pipeline.c
index 177a37be6..0e906babc 100644
--- a/clutter/cogl/cogl/cogl-pipeline.c
+++ b/clutter/cogl/cogl/cogl-pipeline.c
@@ -459,6 +459,7 @@ _cogl_pipeline_copy (CoglPipeline *src, gboolean is_weak)
*/
pipeline->layers_cache_dirty = TRUE;
+ pipeline->deprecated_get_layers_list = NULL;
pipeline->deprecated_get_layers_list_dirty = TRUE;
pipeline->fragend = src->fragend;