[cogl/wip/rig: 21/33] pipeline: don't free BigState before we might dereference it



commit 7856a3dbd718df26a1ad036ab24eb41167acd5bf
Author: Robert Bragg <robert bragg intel com>
Date:   Wed Mar 26 17:14:41 2014 +0000

    pipeline: don't free BigState before we might dereference it

 cogl/cogl-pipeline.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/cogl/cogl-pipeline.c b/cogl/cogl-pipeline.c
index 76acf66..a6af761 100644
--- a/cogl/cogl-pipeline.c
+++ b/cogl/cogl-pipeline.c
@@ -442,9 +442,6 @@ _cogl_pipeline_free (CoglPipeline *pipeline)
       _cogl_bitmask_destroy (&uniforms_state->changed_mask);
     }
 
-  if (pipeline->differences & COGL_PIPELINE_STATE_NEEDS_BIG_STATE)
-    u_slice_free (CoglPipelineBigState, pipeline->big_state);
-
   if (pipeline->differences & COGL_PIPELINE_STATE_LAYERS)
     {
       u_list_foreach (pipeline->layer_differences,
@@ -460,6 +457,9 @@ _cogl_pipeline_free (CoglPipeline *pipeline)
 
   recursively_free_layer_caches (pipeline);
 
+  if (pipeline->differences & COGL_PIPELINE_STATE_NEEDS_BIG_STATE)
+    u_slice_free (CoglPipelineBigState, pipeline->big_state);
+
   u_slice_free (CoglPipeline, pipeline);
 }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]