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




commit 1d435b8becc8c7cb5c257cd0fe4daac1808e2217
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 c68d636878..b215f69982 100644
--- a/clutter/clutter/clutter-stage.c
+++ b/clutter/clutter/clutter-stage.c
@@ -3778,12 +3778,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]