[mutter/wip/carlosg/grabs-pt2: 25/25] clutter: Move priv variable initialization after precondition checks




commit 860a82b3a7fff412b342ad9f1723803e7be0995a
Author: Carlos Garnacho <carlosg gnome org>
Date:   Sun Jan 16 18:00:35 2022 +0100

    clutter: Move priv variable initialization after precondition checks
    
    In case of misuse (e.g. passing NULL stage) this might result in crashes
    before the precondition checks managed to kick in. Move this priv variable
    initialization after these checks.

 clutter/clutter/clutter-stage.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
---
diff --git a/clutter/clutter/clutter-stage.c b/clutter/clutter/clutter-stage.c
index de3315b42c..6503f973b3 100644
--- a/clutter/clutter/clutter-stage.c
+++ b/clutter/clutter/clutter-stage.c
@@ -3787,12 +3787,14 @@ ClutterGrab *
 clutter_stage_grab (ClutterStage *stage,
                     ClutterActor *actor)
 {
-  ClutterStagePrivate *priv = stage->priv;
+  ClutterStagePrivate *priv;
   ClutterGrab *grab;
 
   g_return_val_if_fail (CLUTTER_IS_STAGE (stage), NULL);
   g_return_val_if_fail (CLUTTER_IS_ACTOR (actor), NULL);
 
+  priv = stage->priv;
+
   if (!priv->topmost_grab)
     {
       ClutterMainContext *context;


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