Fix potential crash in suspend and shutdown (Fixes #65)

By always setting the GError we avoid NULL pointer dereference and
consequently crashes when failing to lock/suspend/shutdown.

1 files changed, 7 insertions, 0 deletions

diff --git a/xfce4-session/xfsm-shutdown-fallback.c b/xfce4-session/xfsm-shutdown-fallback.c
index 954ab259..ff6b81b8 100644
--- a/xfce4-session/xfsm-shutdown-fallback.c
+++ b/xfce4-session/xfsm-shutdown-fallback.c
@@ -347,6 +347,8 @@ lock_screen (GError **error)
       /* sleep 2 seconds so locking has time to startup */
       g_usleep (G_USEC_PER_SEC * 2);
     }
+  else
+    g_set_error (error, 1, 0, "Failed to lock the screen.");
 
   g_object_unref (G_OBJECT (saver));
 
@@ -410,6 +412,7 @@ xfsm_shutdown_fallback_try_action (XfsmShutdownType   type,
         return FALSE;
       break;
     default:
+      g_set_error (error, 1, 0, "Unknown shutdown type %d", type);
       return FALSE;
   }
 
@@ -429,6 +432,10 @@ xfsm_shutdown_fallback_try_action (XfsmShutdownType   type,
 
   g_free (command);
 #endif
+  if (!ret)
+    {
+      g_set_error (error, 1, 0, "Failed to %s (%s)", xfsm_helper_action, cmd);
+    }
   return ret;
 }