Attachment 154337 Details for Bug 239439 – adds extra checks to some return values

[patch] adds extra checks to some return values

control-center-2.18.0-fix-warnings.patch (text/plain), 3.78 KB, created by Sertaç Ö. Yıldız on 2007-05-08 13:55:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sertaç Ö. Yıldız

Created: 2007-05-08 13:55:45 UTC

Size: 3.78 KB

patch

obsolete

>--- control-center-2.18.0-orig/libslab/libslab-utils.c	2007-05-08 15:32:46.000000000 +0300
>+++ control-center-2.18.0/libslab/libslab-utils.c	2007-05-08 15:54:56.000000000 +0300
>@@ -307,9 +307,11 @@ libslab_get_gconf_value (const gchar *ke
> 	client = gconf_client_get_default ();
> 	value  = gconf_client_get (client, key, & error);
> 
>-	if (error || ! value)
>+	if (error)
> 		libslab_handle_g_error (& error, "%s: error getting %s", G_STRFUNC, key);
> 	else {
>+		if (!value) goto out;
>+
> 		switch (value->type) {
> 			case GCONF_VALUE_STRING:
> 				retval = (gpointer) g_strdup (gconf_value_get_string (value));
>@@ -351,8 +353,9 @@ libslab_get_gconf_value (const gchar *ke
> 		}
> 	}
> 
>-	g_object_unref (client);
> 	gconf_value_free (value);
>+out:
>+	g_object_unref (client);
> 
> 	return retval;
> }
>@@ -597,7 +600,6 @@ get_uri_list (const gchar *path)
> 	EggBookmarkFile *bm_file;
> #endif
> 
>-	gchar **uris_array;
> 	GList  *uris_list = NULL;
> 
> 	GError *error = NULL;
>@@ -617,6 +619,7 @@ get_uri_list (const gchar *path)
> #endif
> 
> 	if (! error) {
>+		gchar **uris_array;
> #ifdef USE_G_BOOKMARK
> 		uris_array = g_bookmark_file_get_uris (bm_file, NULL);
> #else
>@@ -625,13 +628,13 @@ get_uri_list (const gchar *path)
> 
> 		for (i = 0; uris_array [i]; ++i)
> 			uris_list = g_list_append (uris_list, g_strdup (uris_array [i]));
>+
>+		g_strfreev (uris_array);
> 	}
> 	else
> 		libslab_handle_g_error (
> 			& error, "%s: couldn't load bookmark file [%s]", G_STRFUNC, path);
> 
>-	g_strfreev (uris_array);
>-
> #ifdef USE_G_BOOKMARK
> 	g_bookmark_file_free (bm_file);
> #else
>@@ -776,6 +779,7 @@ libslab_system_item_store_has_uri (const
> 
> 
> 	path = libslab_get_system_item_store_path (FALSE);
>+	if (!path) return FALSE;
> 
> 	exists = store_has_uri (path, uri);
> 
>@@ -792,6 +796,7 @@ libslab_user_apps_store_has_uri (const g
> 
> 
> 	path = libslab_get_user_apps_store_path (FALSE);
>+	if (!path) return FALSE;
> 
> 	exists = store_has_uri (path, uri);
> 
>@@ -808,6 +813,7 @@ libslab_user_docs_store_has_uri (const g
> 
> 
> 	path = libslab_get_user_docs_store_path (FALSE);
>+	if (!path) return FALSE;
> 
> 	exists = store_has_uri (path, uri);
> 
>@@ -1028,6 +1034,8 @@ add_store_file_monitor (const gchar *fil
> 
> 
> 	path = get_data_file_path (filename, FALSE);
>+	if (!path) return NULL;
>+
> 	uri  = g_filename_to_uri (path, NULL, NULL);
> 
> 	gnome_vfs_monitor_add (& handle, uri, GNOME_VFS_MONITOR_FILE, callback, user_data);
>--- control-center-2.18.0-orig/shell/control-center.schemas.in	2007-05-08 16:18:29.000000000 +0300
>+++ control-center-2.18.0/shell/control-center.schemas.in	2007-05-08 16:19:43.000000000 +0300
>@@ -7,7 +7,7 @@
> 			<type>list</type>
> 			<list_type>string</list_type>
> 			<locale name="C">
>-				<default>[Change Desktop Background;background.desktop,Change Theme;gtk-theme-selector.desktop,Set Preferred Applications;default-applications.desktop,Add Printer;gnome-cups-manager.desktop]</default>
>+				<default>[Change Desktop Background;gnome-background.desktop,Change Theme;gnome-gtk-theme-selector.desktop,Set Preferred Applications;gnome-default-applications.desktop,Add Printer;gnome-cups-manager.desktop]</default>
> 				<short>Task names and associated .desktop files</short>
> 				<long>The task name to be displayed in the control-center (thus needing to be translated) followed by a ";" separator then the filename of an associated .desktop file to launch for that task.</long>
> 			</locale>

Actions: View | Diff

Attachments on bug 239439: 154337