diff options
| author | Alessandro Bono <alessandro.bono369@gmail.com> | 2022-08-31 16:40:31 +0200 |
|---|---|---|
| committer | Alessandro Bono <alessandro.bono369@gmail.com> | 2022-10-29 12:38:37 +0200 |
| commit | 51df78d96d71ae063fe6454cc9ee6cc9842425ab (patch) | |
| tree | b426c5da4228d2a773b9a3feb0495c708cb2077c /common | |
| parent | e3332b75059de1e83482b5786f55d639acf90faa (diff) | |
| download | gdm-51df78d96d71ae063fe6454cc9ee6cc9842425ab.tar.gz | |
gdm-settings-desktop-backend: Add missing guards in public functions
...and also in private get/set functions that are called via
gdm_settings_get_value() and gdm_settings_set_value().
gdm_settings_get_value() is never called with value == NULL.
Remove this case and add a guard.
Diffstat (limited to 'common')
| -rw-r--r-- | common/gdm-settings-desktop-backend.c | 13 |
1 files changed, 6 insertions, 7 deletions
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; |