[gnome-settings-daemon/gnome-3-4] power: Fix possible crashers reusing set GError



commit 9285cd73336710d72d13040bcb3109d0327cd803
Author: Bastien Nocera <hadess hadess net>
Date:   Fri Oct 19 17:02:06 2012 +0200

    power: Fix possible crashers reusing set GError
    
    When setting the panel's backlight can't be turned off for example,
    switching off the keyboard's backlight will fail as well, as the
    error will be invalid for use.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=686468

 plugins/power/gsd-power-manager.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
index 31a20a9..b589162 100644
--- a/plugins/power/gsd-power-manager.c
+++ b/plugins/power/gsd-power-manager.c
@@ -2348,7 +2348,7 @@ do_lid_closed_action (GsdPowerManager *manager)
         if (!ret) {
                 g_warning ("failed to turn the panel off after lid close: %s",
                            error->message);
-                g_error_free (error);
+                g_clear_error (&error);
         }
 
         /* only toggle keyboard if present and not already toggled */
@@ -3011,7 +3011,7 @@ idle_set_mode (GsdPowerManager *manager, GsdPowerIdleMode mode)
                 if (!ret) {
                         g_warning ("failed to turn the panel off: %s",
                                    error->message);
-                        g_error_free (error);
+                        g_clear_error (&error);
                 }
 
                 /* only toggle keyboard if present and not already toggled */
@@ -3059,7 +3059,7 @@ idle_set_mode (GsdPowerManager *manager, GsdPowerIdleMode mode)
                                 g_warning ("failed to restore backlight to %i: %s",
                                            manager->priv->pre_dim_brightness,
                                            error->message);
-                                g_error_free (error);
+                                g_clear_error (&error);
                         } else {
                                 manager->priv->pre_dim_brightness = -1;
                         }
@@ -3072,7 +3072,7 @@ idle_set_mode (GsdPowerManager *manager, GsdPowerIdleMode mode)
                         if (!ret) {
                                 g_warning ("failed to turn the kbd backlight on: %s",
                                            error->message);
-                                g_error_free (error);
+                                g_clear_error (&error);
                         }
                 }
 



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