[mutter/wip/carlosg/grabs-pt2] clutter: Move priv variable initialization after precondition checks
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/wip/carlosg/grabs-pt2] clutter: Move priv variable initialization after precondition checks
- Date: Sun, 16 Jan 2022 17:02:34 +0000 (UTC)
commit c5d2a78f6c418ecfba95797b1b015cb02586ede8
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]