Merge branch 'wip/abono/add-missing-guards-in-public-functions' into 'main'

Add missing guards in public functions

See merge request GNOME/gdm!192

19 files changed, 168 insertions, 34 deletions

diff --git a/common/gdm-address.c b/common/gdm-address.c
index a8b73e28..66dc5904 100644
--- a/common/gdm-address.c
+++ b/common/gdm-address.c
@@ -240,6 +240,8 @@ gdm_address_debug (GdmAddress *address)
         char *host = NULL;
         char *port = NULL;
 
+        g_return_if_fail (address != NULL);
+
         gdm_address_get_numeric_info (address, &host, &port);
 
         _gdm_address_debug (address, host, port);
@@ -494,6 +496,8 @@ gdm_address_is_local (GdmAddress *address)
 {
         const GList *list;
 
+        g_return_val_if_fail (address != NULL, FALSE);
+
         if (gdm_address_is_loopback (address)) {
                 return TRUE;
         }
diff --git a/common/gdm-common.c b/common/gdm-common.c
index 92029027..3e31f426 100644
--- a/common/gdm-common.c
+++ b/common/gdm-common.c
@@ -360,6 +360,10 @@ gdm_activate_session_by_id (GDBusConnection *connection,
         GError *local_error = NULL;
         GVariant *reply;
 
+        g_return_val_if_fail (G_IS_DBUS_CONNECTION (connection), FALSE);
+        g_return_val_if_fail (seat_id != NULL, FALSE);
+        g_return_val_if_fail (session_id != NULL, FALSE);
+
         reply = g_dbus_connection_call_sync (connection,
                                              "org.freedesktop.login1",
                                              "/org/freedesktop/login1",
@@ -392,6 +396,8 @@ gdm_get_login_window_session_id (const char  *seat_id,
         char      *service_class;
         char      *state;
 
+        g_return_val_if_fail (session_id != NULL, FALSE);
+
         res = sd_seat_get_sessions (seat_id, &sessions, NULL, NULL);
         if (res < 0) {
                 g_debug ("Failed to determine sessions: %s", strerror (-res));
diff --git a/common/gdm-settings-backend.c b/common/gdm-settings-backend.c
index 5ad30222..57c9de03 100644
--- a/common/gdm-settings-backend.c
+++ b/common/gdm-settings-backend.c
@@ -90,6 +90,8 @@ gdm_settings_backend_get_value (GdmSettingsBackend *settings_backend,
         gboolean ret;
 
         g_return_val_if_fail (GDM_IS_SETTINGS_BACKEND (settings_backend), FALSE);
+        g_return_val_if_fail (key != NULL, FALSE);
+        g_return_val_if_fail (value != NULL, FALSE);
 
         g_object_ref (settings_backend);
         ret = GDM_SETTINGS_BACKEND_GET_CLASS (settings_backend)->get_value (settings_backend, key, value, error);
@@ -107,6 +109,8 @@ gdm_settings_backend_set_value (GdmSettingsBackend *settings_backend,
         gboolean ret;
 
         g_return_val_if_fail (GDM_IS_SETTINGS_BACKEND (settings_backend), FALSE);
+        g_return_val_if_fail (key != NULL, FALSE);
+        g_return_val_if_fail (value != NULL, FALSE);
 
         g_object_ref (settings_backend);
         ret = GDM_SETTINGS_BACKEND_GET_CLASS (settings_backend)->set_value (settings_backend, key, value, error);
diff --git a/common/gdm-settings-desktop-backend.c b/common/gdm-settings-desktop-backend.c
index e899fe5c..cdc287ad 100644
--- a/common/gdm-settings-desktop-backend.c
+++ b/common/gdm-settings-desktop-backend.c
@@ -231,12 +231,10 @@ gdm_settings_desktop_backend_get_value (GdmSettingsBackend *backend,
 
         g_return_val_if_fail (GDM_IS_SETTINGS_BACKEND (backend), FALSE);
         g_return_val_if_fail (key != NULL, FALSE);
+        g_return_val_if_fail (value != NULL, FALSE);
 
         ret = FALSE;
-
-        if (value != NULL) {
-                *value = NULL;
-        }
+        *value = NULL;
 
         val = g = k = l = NULL;
         /*GDM_SETTINGS_BACKEND_CLASS (gdm_settings_desktop_backend_parent_class)->get_value (display);*/
@@ -257,9 +255,7 @@ gdm_settings_desktop_backend_get_value (GdmSettingsBackend *backend,
                 goto out;
         }
 
-        if (value != NULL) {
-                *value = g_strdup (val);
-        }
+        *value = g_strdup (val);
         ret = TRUE;
  out:
         g_free (val);
@@ -345,6 +341,7 @@ gdm_settings_desktop_backend_set_value (GdmSettingsBackend *backend,
 
         g_return_val_if_fail (GDM_IS_SETTINGS_BACKEND (backend), FALSE);
         g_return_val_if_fail (key != NULL, FALSE);
+        g_return_val_if_fail (value != NULL, FALSE);
 
         /*GDM_SETTINGS_BACKEND_CLASS (gdm_settings_desktop_backend_parent_class)->get_value (display);*/
         if (! parse_key_string (key, &g, &k, &l, NULL)) {
@@ -427,6 +424,8 @@ gdm_settings_desktop_backend_new (const char* filename)
 {
         GObject *object;
 
+        g_return_val_if_fail (filename != NULL, NULL);
+
         if (!g_file_test (filename, G_FILE_TEST_IS_REGULAR))
                 return NULL;
 
diff --git a/common/gdm-settings-direct.c b/common/gdm-settings-direct.c
index c3653172..b6954fb0 100644
--- a/common/gdm-settings-direct.c
+++ b/common/gdm-settings-direct.c
@@ -102,6 +102,7 @@ gdm_settings_direct_get_int (const char        *key,
         char             *str;
 
         g_return_val_if_fail (key != NULL, FALSE);
+        g_return_val_if_fail (value != NULL, FALSE);
 
         entry = get_entry_for_key (key);
         g_assert (entry != NULL);
@@ -129,6 +130,9 @@ gdm_settings_direct_get_uint (const char        *key,
         gboolean          ret;
         int               intvalue;
 
+        g_return_val_if_fail (key != NULL, FALSE);
+        g_return_val_if_fail (value != NULL, FALSE);
+
         ret = gdm_settings_direct_get_int (key, &intvalue);
    
         if (intvalue >= 0)
@@ -149,6 +153,7 @@ gdm_settings_direct_get_boolean (const char        *key,
         char             *str;
 
         g_return_val_if_fail (key != NULL, FALSE);
+        g_return_val_if_fail (value != NULL, FALSE);
 
         entry = get_entry_for_key (key);
         g_assert (entry != NULL);
@@ -179,6 +184,7 @@ gdm_settings_direct_get_string (const char        *key,
         char             *str;
 
         g_return_val_if_fail (key != NULL, FALSE);
+        g_return_val_if_fail (value != NULL, FALSE);
 
         entry = get_entry_for_key (key);
         g_assert (entry != NULL);
@@ -194,9 +200,7 @@ gdm_settings_direct_get_string (const char        *key,
                 str = g_strdup (gdm_settings_entry_get_default_value (entry));
         }
 
-        if (value != NULL) {
-                *value = g_strdup (str);
-        }
+        *value = g_strdup (str);
 
         g_free (str);
 
diff --git a/common/gdm-settings-utils.c b/common/gdm-settings-utils.c
index 4e63a565..636be3a9 100644
--- a/common/gdm-settings-utils.c
+++ b/common/gdm-settings-utils.c
@@ -62,24 +62,32 @@ gdm_settings_entry_new (void)
 const char *
 gdm_settings_entry_get_key (GdmSettingsEntry *entry)
 {
+        g_return_val_if_fail (entry != NULL, NULL);
+
         return entry->key;
 }
 
 const char *
 gdm_settings_entry_get_signature (GdmSettingsEntry *entry)
 {
+        g_return_val_if_fail (entry != NULL, NULL);
+
         return entry->signature;
 }
 
 const char *
 gdm_settings_entry_get_default_value (GdmSettingsEntry *entry)
 {
+        g_return_val_if_fail (entry != NULL, NULL);
+
         return entry->default_value;
 }
 
 const char *
 gdm_settings_entry_get_value (GdmSettingsEntry *entry)
 {
+        g_return_val_if_fail (entry != NULL, NULL);
+
         return entry->value;
 }
 
@@ -87,6 +95,8 @@ void
 gdm_settings_entry_set_value (GdmSettingsEntry *entry,
                               const char       *value)
 {
+        g_return_if_fail (entry != NULL);
+
         g_free (entry->value);
         entry->value = g_strdup (value);
 }
@@ -94,6 +104,8 @@ gdm_settings_entry_set_value (GdmSettingsEntry *entry,
 void
 gdm_settings_entry_free (GdmSettingsEntry *entry)
 {
+        g_return_if_fail (entry != NULL);
+
         g_free (entry->key);
         g_free (entry->signature);
         g_free (entry->default_value);
@@ -220,8 +232,7 @@ gdm_settings_parse_schemas (const char  *file,
 
         g_return_val_if_fail (file != NULL, FALSE);
         g_return_val_if_fail (root != NULL, FALSE);
-
-        g_assert (schemas != NULL);
+        g_return_val_if_fail (schemas != NULL, FALSE);
 
         contents = NULL;
         error = NULL;
@@ -278,6 +289,9 @@ gboolean
 gdm_settings_parse_value_as_boolean (const char *value,
                                      gboolean   *bool)
 {
+        g_return_val_if_fail (value != NULL, FALSE);
+        g_return_val_if_fail (bool != NULL, FALSE);
+
         if (g_ascii_strcasecmp (value, "true") == 0 || strcmp (value, "1") == 0) {
                 *bool = TRUE;
                 return TRUE;
@@ -297,6 +311,9 @@ gdm_settings_parse_value_as_integer (const char *value,
         glong long_value;
         gint  int_value;
 
+        g_return_val_if_fail (value != NULL, FALSE);
+        g_return_val_if_fail (intval != NULL, FALSE);
+
         errno = 0;
         long_value = strtol (value, &end_of_valid_int, 10);
 
@@ -321,6 +338,9 @@ gdm_settings_parse_value_as_double  (const char *value,
         char   *end_of_valid_d;
         gdouble double_value = 0;
 
+        g_return_val_if_fail (value != NULL, FALSE);
+        g_return_val_if_fail (doubleval != NULL, FALSE);
+
         double_value = g_ascii_strtod (value, &end_of_valid_d);
 
         if (*end_of_valid_d != '\0' || end_of_valid_d == value) {
diff --git a/common/gdm-settings.c b/common/gdm-settings.c
index 8ff33e43..77b3316c 100644
--- a/common/gdm-settings.c
+++ b/common/gdm-settings.c
@@ -123,6 +123,7 @@ gdm_settings_set_value (GdmSettings *settings,
         g_return_val_if_fail (GDM_IS_SETTINGS (settings), FALSE);
         g_return_val_if_fail (settings->backends != NULL, FALSE);
         g_return_val_if_fail (key != NULL, FALSE);
+        g_return_val_if_fail (value != NULL, FALSE);
 
         g_debug ("Setting value %s", key);
 
@@ -192,6 +193,8 @@ gdm_settings_reload (GdmSettings *settings)
         GList *l;
         GdmSettingsBackend *backend;
 
+        g_return_if_fail (GDM_IS_SETTINGS (settings));
+
         g_list_foreach (settings->backends, (GFunc) g_object_unref, NULL);
         g_list_free (settings->backends);
         settings->backends = NULL;
diff --git a/daemon/gdm-dbus-util.c b/daemon/gdm-dbus-util.c
index 844d60ab..678fe7c9 100644
--- a/daemon/gdm-dbus-util.c
+++ b/daemon/gdm-dbus-util.c
@@ -114,6 +114,9 @@ gdm_dbus_get_pid_for_name (const char  *system_bus_name,
         gboolean retval = FALSE;
         unsigned int v;
 
+        g_return_val_if_fail (system_bus_name != NULL, FALSE);
+        g_return_val_if_fail (out_pid != NULL, FALSE);
+
         bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, error);
         if (bus == NULL) {
                 return FALSE;
@@ -154,6 +157,9 @@ gdm_dbus_get_uid_for_name (const char  *system_bus_name,
         gboolean retval = FALSE;
         unsigned int v;
 
+        g_return_val_if_fail (system_bus_name != NULL, FALSE);
+        g_return_val_if_fail (out_uid != NULL, FALSE);
+
         bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, error);
         if (bus == NULL) {
                 return FALSE;
diff --git a/daemon/gdm-display-access-file.c b/daemon/gdm-display-access-file.c
index ed0a146d..d0dd5cc8 100644
--- a/daemon/gdm-display-access-file.c
+++ b/daemon/gdm-display-access-file.c
@@ -410,7 +410,7 @@ gdm_display_access_file_open (GdmDisplayAccessFile  *file,
 {
         GError *create_error;
 
-        g_return_val_if_fail (file != NULL, FALSE);
+        g_return_val_if_fail (GDM_IS_DISPLAY_ACCESS_FILE (file), FALSE);
         g_return_val_if_fail (file->fp == NULL, FALSE);
         g_return_val_if_fail (file->path == NULL, FALSE);
 
@@ -480,8 +480,9 @@ gdm_display_access_file_add_display (GdmDisplayAccessFile  *file,
         GError  *add_error;
         gboolean display_added;
 
-        g_return_val_if_fail (file != NULL, FALSE);
+        g_return_val_if_fail (GDM_IS_DISPLAY_ACCESS_FILE (file), FALSE);
         g_return_val_if_fail (file->path != NULL, FALSE);
+        g_return_val_if_fail (display != NULL, FALSE);
         g_return_val_if_fail (cookie != NULL, FALSE);
 
         add_error = NULL;
@@ -519,8 +520,9 @@ gdm_display_access_file_add_display_with_cookie (GdmDisplayAccessFile  *file,
         Xauth auth_entry;
         gboolean display_added;
 
-        g_return_val_if_fail (file != NULL, FALSE);
+        g_return_val_if_fail (GDM_IS_DISPLAY_ACCESS_FILE (file), FALSE);
         g_return_val_if_fail (file->path != NULL, FALSE);
+        g_return_val_if_fail (display != NULL, FALSE);
         g_return_val_if_fail (cookie != NULL, FALSE);
 
         _get_auth_info_for_display (file, display,
@@ -574,7 +576,7 @@ gdm_display_access_file_close (GdmDisplayAccessFile  *file)
 {
         char *auth_dir;
 
-        g_return_if_fail (file != NULL);
+        g_return_if_fail (GDM_IS_DISPLAY_ACCESS_FILE (file));
         g_return_if_fail (file->fp != NULL);
         g_return_if_fail (file->path != NULL);
 
@@ -608,7 +610,9 @@ gdm_display_access_file_close (GdmDisplayAccessFile  *file)
 }
 
 char *
-gdm_display_access_file_get_path (GdmDisplayAccessFile *access_file)
+gdm_display_access_file_get_path (GdmDisplayAccessFile *file)
 {
-        return g_strdup (access_file->path);
+        g_return_val_if_fail (GDM_IS_DISPLAY_ACCESS_FILE (file), NULL);
+
+        return g_strdup (file->path);
 }
diff --git a/daemon/gdm-display-factory.c b/daemon/gdm-display-factory.c
index 78b23804..8ff40ce1 100644
--- a/daemon/gdm-display-factory.c
+++ b/daemon/gdm-display-factory.c
@@ -95,6 +95,8 @@ gdm_display_factory_queue_purge_displays (GdmDisplayFactory *factory)
 {
         GdmDisplayFactoryPrivate *priv;
 
+        g_return_if_fail (GDM_IS_DISPLAY_FACTORY (factory));
+
         priv = gdm_display_factory_get_instance_private (factory);
         if (priv->purge_displays_id == 0) {
                 priv->purge_displays_id = g_idle_add ((GSourceFunc) purge_displays, factory);
diff --git a/daemon/gdm-display-store.c b/daemon/gdm-display-store.c
index 587e9795..de503f3e 100644
--- a/daemon/gdm-display-store.c
+++ b/daemon/gdm-display-store.c
@@ -101,7 +101,7 @@ gdm_display_store_error_quark (void)
 void
 gdm_display_store_clear (GdmDisplayStore    *store)
 {
-        g_return_if_fail (store != NULL);
+        g_return_if_fail (GDM_IS_DISPLAY_STORE (store));
         g_debug ("GdmDisplayStore: Clearing display store");
         g_hash_table_remove_all (store->displays);
 }
@@ -121,7 +121,8 @@ gboolean
 gdm_display_store_remove (GdmDisplayStore    *store,
                           GdmDisplay         *display)
 {
-        g_return_val_if_fail (store != NULL, FALSE);
+        g_return_val_if_fail (GDM_IS_DISPLAY_STORE (store), FALSE);
+        g_return_val_if_fail (display != NULL, FALSE);
 
         gdm_display_store_foreach_remove (store,
                                           (GdmDisplayStoreFunc)remove_display,
@@ -162,7 +163,7 @@ gdm_display_store_foreach (GdmDisplayStore    *store,
 {
         FindClosure  closure;
 
-        g_return_if_fail (store != NULL);
+        g_return_if_fail (GDM_IS_DISPLAY_STORE (store));
         g_return_if_fail (func != NULL);
 
         closure.predicate = func;
@@ -179,7 +180,7 @@ gdm_display_store_lookup (GdmDisplayStore *store,
 {
         StoredDisplay *stored_display;
 
-        g_return_val_if_fail (store != NULL, NULL);
+        g_return_val_if_fail (GDM_IS_DISPLAY_STORE (store), NULL);
         g_return_val_if_fail (id != NULL, NULL);
 
         stored_display = g_hash_table_lookup (store->displays,
@@ -199,7 +200,7 @@ gdm_display_store_find (GdmDisplayStore    *store,
         StoredDisplay *stored_display;
         FindClosure    closure;
 
-        g_return_val_if_fail (store != NULL, NULL);
+        g_return_val_if_fail (GDM_IS_DISPLAY_STORE (store), NULL);
         g_return_val_if_fail (predicate != NULL, NULL);
 
         closure.predicate = predicate;
@@ -224,7 +225,7 @@ gdm_display_store_foreach_remove (GdmDisplayStore    *store,
         FindClosure closure;
         guint       ret;
 
-        g_return_val_if_fail (store != NULL, 0);
+        g_return_val_if_fail (GDM_IS_DISPLAY_STORE (store), 0);
         g_return_val_if_fail (func != NULL, 0);
 
         closure.predicate = func;
@@ -243,7 +244,7 @@ gdm_display_store_add (GdmDisplayStore *store,
         char          *id;
         StoredDisplay *stored_display;
 
-        g_return_if_fail (store != NULL);
+        g_return_if_fail (GDM_IS_DISPLAY_STORE (store));
         g_return_if_fail (display != NULL);
 
         gdm_display_get_id (display, &id, NULL);
@@ -305,7 +306,6 @@ gdm_display_store_finalize (GObject *object)
 {
         GdmDisplayStore *store;
 
-        g_return_if_fail (object != NULL);
         g_return_if_fail (GDM_IS_DISPLAY_STORE (object));
 
         store = GDM_DISPLAY_STORE (object);
diff --git a/daemon/gdm-display.c b/daemon/gdm-display.c
index 42762fd8..dd617227 100644
--- a/daemon/gdm-display.c
+++ b/daemon/gdm-display.c
@@ -168,6 +168,8 @@ gdm_display_get_session_id (GdmDisplay *self)
 {
         GdmDisplayPrivate *priv;
 
+        g_return_val_if_fail (GDM_IS_DISPLAY (self), NULL);
+
         priv = gdm_display_get_instance_private (self);
         return priv->session_id;
 }
@@ -261,6 +263,8 @@ gdm_display_add_user_authorization (GdmDisplay *self,
         xcb_void_cookie_t         cookies[3];
 
         g_return_val_if_fail (GDM_IS_DISPLAY (self), FALSE);
+        g_return_val_if_fail (username != NULL, FALSE);
+        g_return_val_if_fail (filename != NULL, FALSE);
 
         priv = gdm_display_get_instance_private (self);
 
@@ -340,6 +344,7 @@ gdm_display_remove_user_authorization (GdmDisplay *self,
         GdmDisplayPrivate *priv;
 
         g_return_val_if_fail (GDM_IS_DISPLAY (self), FALSE);
+        g_return_val_if_fail (username != NULL, FALSE);
 
         priv = gdm_display_get_instance_private (self);
 
@@ -1470,6 +1475,8 @@ gdm_display_get_object_skeleton (GdmDisplay *self)
 {
         GdmDisplayPrivate *priv;
 
+        g_return_val_if_fail (GDM_IS_DISPLAY (self), NULL);
+
         priv = gdm_display_get_instance_private (self);
         return priv->object_skeleton;
 }
@@ -1695,6 +1702,8 @@ gdm_display_start_greeter_session (GdmDisplay *self)
         char          *hostname;
         char          *auth_file = NULL;
 
+        g_return_if_fail (GDM_IS_DISPLAY (self));
+
         priv = gdm_display_get_instance_private (self);
         g_return_if_fail (g_strcmp0 (priv->session_class, "greeter") == 0);
 
@@ -1761,6 +1770,8 @@ gdm_display_stop_greeter_session (GdmDisplay *self)
 {
         GdmDisplayPrivate *priv;
 
+        g_return_if_fail (GDM_IS_DISPLAY (self));
+
         priv = gdm_display_get_instance_private (self);
 
         if (priv->launch_environment != NULL) {
@@ -1876,6 +1887,8 @@ gdm_display_connect (GdmDisplay *self)
         xcb_auth_info_t *auth_info = NULL;
         gboolean ret;
 
+        g_return_val_if_fail (GDM_IS_DISPLAY (self), FALSE);
+
         priv = gdm_display_get_instance_private (self);
 
         g_debug ("GdmDisplay: Server is ready - opening display %s", priv->x11_display_name);
diff --git a/daemon/gdm-launch-environment.c b/daemon/gdm-launch-environment.c
index 10ab84b3..507d6de7 100644
--- a/daemon/gdm-launch-environment.c
+++ b/daemon/gdm-launch-environment.c
@@ -409,6 +409,8 @@ gdm_launch_environment_start (GdmLaunchEnvironment *launch_environment)
         uid_t             uid;
         gid_t             gid;
 
+        g_return_val_if_fail (GDM_IS_LAUNCH_ENVIRONMENT (launch_environment), FALSE);
+
         g_debug ("GdmLaunchEnvironment: Starting...");
 
         if (!gdm_get_pwent_for_name (launch_environment->user_name, &passwd_entry)) {
@@ -504,6 +506,8 @@ gdm_launch_environment_start (GdmLaunchEnvironment *launch_environment)
 gboolean
 gdm_launch_environment_stop (GdmLaunchEnvironment *launch_environment)
 {
+        g_return_val_if_fail (GDM_IS_LAUNCH_ENVIRONMENT (launch_environment), FALSE);
+
         if (launch_environment->pid > 1) {
                 gdm_signal_pid (-launch_environment->pid, SIGTERM);
         }
@@ -522,12 +526,16 @@ gdm_launch_environment_stop (GdmLaunchEnvironment *launch_environment)
 GdmSession *
 gdm_launch_environment_get_session (GdmLaunchEnvironment *launch_environment)
 {
+        g_return_val_if_fail (GDM_IS_LAUNCH_ENVIRONMENT (launch_environment), NULL);
+
         return launch_environment->session;
 }
 
 char *
 gdm_launch_environment_get_session_id (GdmLaunchEnvironment *launch_environment)
 {
+        g_return_val_if_fail (GDM_IS_LAUNCH_ENVIRONMENT (launch_environment), NULL);
+
         return g_strdup (launch_environment->session_id);
 }
 
diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c
index de3ac966..7f44eb48 100644
--- a/daemon/gdm-manager.c
+++ b/daemon/gdm-manager.c
@@ -2479,6 +2479,8 @@ gdm_manager_get_displays (GdmManager *manager,
 void
 gdm_manager_stop (GdmManager *manager)
 {
+        g_return_if_fail (GDM_IS_MANAGER (manager));
+
         g_debug ("GdmManager: GDM stopping");
 
         if (manager->local_factory != NULL) {
@@ -2497,6 +2499,8 @@ gdm_manager_stop (GdmManager *manager)
 void
 gdm_manager_start (GdmManager *manager)
 {
+        g_return_if_fail (GDM_IS_MANAGER (manager));
+
         g_debug ("GdmManager: GDM starting to manage displays");
 
 #ifdef WITH_PLYMOUTH
diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c
index 451858a7..ebd0a78b 100644
--- a/daemon/gdm-server.c
+++ b/daemon/gdm-server.c
@@ -752,6 +752,8 @@ gdm_server_start (GdmServer *server)
         GError *local_error = NULL;
         GError **error = &local_error;
 
+        g_return_val_if_fail (GDM_IS_SERVER (server), FALSE);
+
         /* Hardcode the VT for the initial X server, but nothing else */
         if (server->is_initial) {
                 vtarg = "vt" G_STRINGIFY (GDM_INITIAL_VT);
@@ -802,6 +804,8 @@ gdm_server_stop (GdmServer *server)
 {
         int res;
 
+        g_return_val_if_fail (GDM_IS_SERVER (server), FALSE);
+
         if (server->pid <= 1) {
                 return TRUE;
         }
diff --git a/daemon/gdm-session-auditor.c b/daemon/gdm-session-auditor.c
index 5f569a9b..63f1666b 100644
--- a/daemon/gdm-session-auditor.c
+++ b/daemon/gdm-session-auditor.c
@@ -274,6 +274,8 @@ gdm_session_auditor_new (const char *hostname,
 void
 gdm_session_auditor_report_password_changed (GdmSessionAuditor *auditor)
 {
+        g_return_if_fail (GDM_IS_SESSION_AUDITOR (auditor));
+
         if (GDM_SESSION_AUDITOR_GET_CLASS (auditor)->report_password_changed != NULL) {
                 GDM_SESSION_AUDITOR_GET_CLASS (auditor)->report_password_changed (auditor);
         }
@@ -282,6 +284,8 @@ gdm_session_auditor_report_password_changed (GdmSessionAuditor *auditor)
 void
 gdm_session_auditor_report_password_change_failure (GdmSessionAuditor *auditor)
 {
+        g_return_if_fail (GDM_IS_SESSION_AUDITOR (auditor));
+
         if (GDM_SESSION_AUDITOR_GET_CLASS (auditor)->report_password_change_failure != NULL) {
                 GDM_SESSION_AUDITOR_GET_CLASS (auditor)->report_password_change_failure (auditor);
         }
@@ -290,6 +294,8 @@ gdm_session_auditor_report_password_change_failure (GdmSessionAuditor *auditor)
 void
 gdm_session_auditor_report_user_accredited (GdmSessionAuditor *auditor)
 {
+        g_return_if_fail (GDM_IS_SESSION_AUDITOR (auditor));
+
         if (GDM_SESSION_AUDITOR_GET_CLASS (auditor)->report_user_accredited != NULL) {
                 GDM_SESSION_AUDITOR_GET_CLASS (auditor)->report_user_accredited (auditor);
         }
@@ -298,6 +304,8 @@ gdm_session_auditor_report_user_accredited (GdmSessionAuditor *auditor)
 void
 gdm_session_auditor_report_login (GdmSessionAuditor *auditor)
 {
+        g_return_if_fail (GDM_IS_SESSION_AUDITOR (auditor));
+
         if (GDM_SESSION_AUDITOR_GET_CLASS (auditor)->report_login != NULL) {
                 GDM_SESSION_AUDITOR_GET_CLASS (auditor)->report_login (auditor);
         }
@@ -308,6 +316,8 @@ gdm_session_auditor_report_login_failure (GdmSessionAuditor *auditor,
                                           int                error_code,
                                           const char        *error_message)
 {
+        g_return_if_fail (GDM_IS_SESSION_AUDITOR (auditor));
+
         if (GDM_SESSION_AUDITOR_GET_CLASS (auditor)->report_login_failure != NULL) {
                 GDM_SESSION_AUDITOR_GET_CLASS (auditor)->report_login_failure (auditor, error_code, error_message);
         }
@@ -316,6 +326,8 @@ gdm_session_auditor_report_login_failure (GdmSessionAuditor *auditor,
 void
 gdm_session_auditor_report_logout (GdmSessionAuditor *auditor)
 {
+        g_return_if_fail (GDM_IS_SESSION_AUDITOR (auditor));
+
         if (GDM_SESSION_AUDITOR_GET_CLASS (auditor)->report_logout != NULL) {
                 GDM_SESSION_AUDITOR_GET_CLASS (auditor)->report_logout (auditor);
         }
diff --git a/daemon/gdm-session-settings.c b/daemon/gdm-session-settings.c
index c820f1fb..baa08f5f 100644
--- a/daemon/gdm-session-settings.c
+++ b/daemon/gdm-session-settings.c
@@ -272,6 +272,8 @@ gdm_session_settings_new (void)
 gboolean
 gdm_session_settings_is_loaded (GdmSessionSettings  *settings)
 {
+        g_return_val_if_fail (GDM_IS_SESSION_SETTINGS (settings), FALSE);
+
         if (settings->user == NULL) {
                 return FALSE;
         }
@@ -338,7 +340,7 @@ gdm_session_settings_load (GdmSessionSettings  *settings,
 {
         ActUser *old_user;
 
-        g_return_val_if_fail (settings != NULL, FALSE);
+        g_return_val_if_fail (GDM_IS_SESSION_SETTINGS (settings), FALSE);
         g_return_val_if_fail (username != NULL, FALSE);
         g_return_val_if_fail (!gdm_session_settings_is_loaded (settings), FALSE);
 
diff --git a/daemon/gdm-session-worker-job.c b/daemon/gdm-session-worker-job.c
index 052df1d1..b0967bf5 100644
--- a/daemon/gdm-session-worker-job.c
+++ b/daemon/gdm-session-worker-job.c
@@ -322,6 +322,8 @@ gdm_session_worker_job_start (GdmSessionWorkerJob *session_worker_job,
 {
         gboolean    res;
 
+        g_return_val_if_fail (GDM_IS_SESSION_WORKER_JOB (session_worker_job), FALSE);
+
         g_debug ("GdmSessionWorkerJob: Starting worker...");
 
         res = gdm_session_worker_job_spawn (session_worker_job, name);
@@ -352,6 +354,8 @@ handle_session_worker_job_death (GdmSessionWorkerJob *session_worker_job)
 void
 gdm_session_worker_job_stop_now (GdmSessionWorkerJob *session_worker_job)
 {
+        g_return_if_fail (GDM_IS_SESSION_WORKER_JOB (session_worker_job));
+
         if (session_worker_job->pid <= 1) {
                 return;
         }
@@ -368,6 +372,8 @@ gdm_session_worker_job_stop (GdmSessionWorkerJob *session_worker_job)
 {
         int res;
 
+        g_return_if_fail (GDM_IS_SESSION_WORKER_JOB (session_worker_job));
+
         if (session_worker_job->pid <= 1) {
                 return;
         }
diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
index 4b709731..4b8ba156 100644
--- a/daemon/gdm-session.c
+++ b/daemon/gdm-session.c
@@ -682,6 +682,8 @@ void
 gdm_session_select_user (GdmSession *self,
                          const char *text)
 {
+        g_return_if_fail (GDM_IS_SESSION (self));
+        g_return_if_fail (text != NULL);
 
         g_debug ("GdmSession: selecting user '%s' for session '%s' (%p)",
                  text,
@@ -2293,6 +2295,7 @@ gdm_session_start_conversation (GdmSession *self,
         GdmSessionConversation *conversation;
 
         g_return_val_if_fail (GDM_IS_SESSION (self), FALSE);
+        g_return_val_if_fail (service_name != NULL, FALSE);
 
         conversation = g_hash_table_lookup (self->conversations,
                                             service_name);
@@ -2324,6 +2327,7 @@ gdm_session_stop_conversation (GdmSession *self,
         GdmSessionConversation *conversation;
 
         g_return_if_fail (GDM_IS_SESSION (self));
+        g_return_if_fail (service_name != NULL);
 
         g_debug ("GdmSession: stopping conversation %s", service_name);
 
@@ -2448,6 +2452,7 @@ gdm_session_setup (GdmSession *self,
 {
 
         g_return_if_fail (GDM_IS_SESSION (self));
+        g_return_if_fail (service_name != NULL);
 
         update_session_type (self);
 
@@ -2463,6 +2468,7 @@ gdm_session_setup_for_user (GdmSession *self,
 {
 
         g_return_if_fail (GDM_IS_SESSION (self));
+        g_return_if_fail (service_name != NULL);
         g_return_if_fail (username != NULL);
 
         update_session_type (self);
@@ -2486,6 +2492,7 @@ gdm_session_setup_for_program (GdmSession *self,
 {
 
         g_return_if_fail (GDM_IS_SESSION (self));
+        g_return_if_fail (service_name != NULL);
 
         self->is_program_session = TRUE;
         initialize (self, service_name, username, log_file);
@@ -2498,6 +2505,7 @@ gdm_session_authenticate (GdmSession *self,
         GdmSessionConversation *conversation;
 
         g_return_if_fail (GDM_IS_SESSION (self));
+        g_return_if_fail (service_name != NULL);
 
         conversation = find_conversation_by_name (self, service_name);
         if (conversation != NULL) {
@@ -2515,6 +2523,7 @@ gdm_session_authorize (GdmSession *self,
         GdmSessionConversation *conversation;
 
         g_return_if_fail (GDM_IS_SESSION (self));
+        g_return_if_fail (service_name != NULL);
 
         conversation = find_conversation_by_name (self, service_name);
         if (conversation != NULL) {
@@ -2532,6 +2541,7 @@ gdm_session_accredit (GdmSession *self,
         GdmSessionConversation *conversation;
 
         g_return_if_fail (GDM_IS_SESSION (self));
+        g_return_if_fail (service_name != NULL);
 
         conversation = find_conversation_by_name (self, service_name);
         if (conversation != NULL) {
@@ -2571,6 +2581,7 @@ gdm_session_send_environment (GdmSession *self,
         GdmSessionConversation *conversation;
 
         g_return_if_fail (GDM_IS_SESSION (self));
+        g_return_if_fail (service_name != NULL);
 
         conversation = find_conversation_by_name (self, service_name);
         if (conversation != NULL) {
@@ -2645,6 +2656,7 @@ gdm_session_set_environment_variable (GdmSession *self,
                                       const char *key,
                                       const char *value)
 {
+        g_return_if_fail (GDM_IS_SESSION (self));
         g_return_if_fail (key != NULL);
         g_return_if_fail (value != NULL);
 
@@ -2775,6 +2787,7 @@ gdm_session_open_session (GdmSession *self,
         GdmSessionConversation *conversation;
 
         g_return_if_fail (GDM_IS_SESSION (self));
+        g_return_if_fail (service_name != NULL);
 
         conversation = find_conversation_by_name (self, service_name);
 
@@ -2896,6 +2909,7 @@ gdm_session_start_session (GdmSession *self,
         gboolean               register_session;
 
         g_return_if_fail (GDM_IS_SESSION (self));
+        g_return_if_fail (service_name != NULL);
         g_return_if_fail (self->session_conversation == NULL);
 
         conversation = find_conversation_by_name (self, service_name);
@@ -3053,6 +3067,8 @@ gdm_session_answer_query (GdmSession *self,
         GdmSessionConversation *conversation;
 
         g_return_if_fail (GDM_IS_SESSION (self));
+        g_return_if_fail (service_name != NULL);
+        g_return_if_fail (text != NULL);
 
         conversation = find_conversation_by_name (self, service_name);
 
@@ -3072,6 +3088,8 @@ gdm_session_cancel  (GdmSession *self)
 void
 gdm_session_reset (GdmSession *self)
 {
+        g_return_if_fail (GDM_IS_SESSION (self));
+
         if (self->user_verifier_interface != NULL) {
                 gdm_dbus_user_verifier_emit_reset (self->user_verifier_interface);
         }
@@ -3084,6 +3102,9 @@ gdm_session_set_timed_login_details (GdmSession *self,
                                      const char *username,
                                      int         delay)
 {
+        g_return_if_fail (GDM_IS_SESSION (self));
+        g_return_if_fail (username != NULL);
+
         g_debug ("GdmSession: timed login details %s %d", username, delay);
         self->timed_login_username = g_strdup (username);
         self->timed_login_delay = delay;
@@ -3092,6 +3113,8 @@ gdm_session_set_timed_login_details (GdmSession *self,
 gboolean
 gdm_session_is_running (GdmSession *self)
 {
+        g_return_val_if_fail (GDM_IS_SESSION (self), FALSE);
+
         return self->session_pid > 0;
 }
 
@@ -3110,13 +3133,16 @@ gdm_session_get_allowed_user (GdmSession *self)
 }
 
 void
-gdm_session_start_reauthentication (GdmSession *session,
+gdm_session_start_reauthentication (GdmSession *self,
                                     GPid        pid_of_caller,
                                     uid_t       uid_of_caller)
 {
-        GdmSessionConversation *conversation = session->session_conversation;
+        GdmSessionConversation *conversation;
 
-        g_return_if_fail (conversation != NULL);
+        g_return_if_fail (GDM_IS_SESSION (self));
+        g_return_if_fail (self->session_conversation != NULL);
+
+        conversation = self->session_conversation;
 
         g_debug ("GdmSession: starting reauthentication for session %s for client with pid %d",
                  conversation->session_id,
@@ -3187,6 +3213,7 @@ gdm_session_get_conversation_session_id (GdmSession *self,
         GdmSessionConversation *conversation;
 
         g_return_val_if_fail (GDM_IS_SESSION (self), NULL);
+        g_return_val_if_fail (service_name != NULL, NULL);
 
         conversation = find_conversation_by_name (self, service_name);
 
@@ -3260,7 +3287,6 @@ gdm_session_session_registers (GdmSession *self)
         gboolean session_registers = FALSE;
         g_autofree char *filename = NULL;
 
-        g_return_val_if_fail (self != NULL, FALSE);
         g_return_val_if_fail (GDM_IS_SESSION (self), FALSE);
 
         filename = get_session_filename (self);
@@ -3293,7 +3319,6 @@ gdm_session_bypasses_xsession (GdmSession *self)
         gboolean    bypasses_xsession = FALSE;
         char       *filename = NULL;
 
-        g_return_val_if_fail (self != NULL, FALSE);
         g_return_val_if_fail (GDM_IS_SESSION (self), FALSE);
 
 #ifdef ENABLE_WAYLAND_SUPPORT
@@ -3331,6 +3356,8 @@ out:
 GdmSessionDisplayMode
 gdm_session_get_display_mode (GdmSession *self)
 {
+        g_return_val_if_fail (GDM_IS_SESSION (self), GDM_SESSION_DISPLAY_MODE_NEW_VT);
+
         g_debug ("GdmSession: type %s, program? %s, seat %s",
                  self->session_type,
                  self->is_program_session? "yes" : "no",
@@ -3384,6 +3411,7 @@ void
 gdm_session_select_program (GdmSession *self,
                             const char *text)
 {
+        g_return_if_fail (GDM_IS_SESSION (self));
 
         g_free (self->selected_program);
 
@@ -3397,6 +3425,9 @@ gdm_session_select_session (GdmSession *self,
         GHashTableIter iter;
         gpointer key, value;
 
+        g_return_if_fail (GDM_IS_SESSION (self));
+        g_return_if_fail (text != NULL);
+
         g_debug ("GdmSession: selecting session '%s'", text);
 
         g_free (self->selected_session);
@@ -4126,7 +4157,9 @@ gdm_session_display_mode_to_string (GdmSessionDisplayMode mode)
 }
 
 GPid
-gdm_session_get_pid (GdmSession *session)
+gdm_session_get_pid (GdmSession *self)
 {
-        return session->session_pid;
+        g_return_val_if_fail (GDM_IS_SESSION (self), 0);
+
+        return self->session_pid;
 }