** Fixes bug #558727 (patch by Frederic van Starbmann)

2008-10-31  Matthew Barnes  <mbarnes@redhat.com>

	** Fixes bug #558727 (patch by Frederic van Starbmann)

	* addressbook/backends/ldap/e-book-backend-ldap.c
	(get_ldap_library_info):
	* camel/camel-vtrash-folder.c (vtrash_append_message),
	(vtrash_transfer_messages_to):
	* libebackend/e-data-server-module (e_data_server_module_load):
	* servers/groupwise/create-account.c (add_account):
	Fix some potential string format crashes.

svn path=/trunk/; revision=9717

diff --git a/ChangeLog b/ChangeLog
index 7b27b51..7ce2a1d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-31  Matthew Barnes  <mbarnes@redhat.com>
+
+       ** Fixes part of bug #558727 (patch by Frederic van Starbmann)
+
+       * libebackend/e-data-server-module (e_data_server_module_load):
+       Fix some potential string format crashes.
+
 2008-10-01  Suman Manjunath  <msuman@novell.com>
 
        ** Fix for bug #554540

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index f519ded..8ac2890 100644 (file)
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-31  Matthew Barnes  <mbarnes@redhat.com>
+
+       ** Fixes part of bug #558727 (patch by Frederic van Starbmann)
+
+       * backends/ldap/e-book-backend-ldap.c (get_ldap_library_info):
+       Fix a potential string format crash.
+
 2008-10-17  Milan Crha  <mcrha@redhat.com>
 
        ** Part of fix for bug #364542

diff --git a/addressbook/backends/ldap/e-book-backend-ldap.c b/addressbook/backends/ldap/e-book-backend-ldap.c
index e7448f1..f119804 100644 (file)
--- a/addressbook/backends/ldap/e-book-backend-ldap.c
+++ b/addressbook/backends/ldap/e-book-backend-ldap.c
@@ -664,7 +664,7 @@ get_ldap_library_info (void)
                /* yuck.  we have to free these? */
                for (i = 0; info.ldapai_extensions[i]; i++) {
                        char *extension = info.ldapai_extensions[i];
-                       g_message (extension);
+                       g_message ("%s", extension);
                        ldap_memfree (extension);
                }
                ldap_memfree (info.ldapai_extensions);

diff --git a/camel/ChangeLog b/camel/ChangeLog
index 37395c9..5de5ce0 100644 (file)
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,11 @@
+2008-10-31  Matthew Barnes  <mbarnes@redhat.com>
+
+       ** Fixes part of bug #558727 (patch by Frederic van Starbmann)
+
+       * camel-vtrash-folder.c (vtrash_append_message),
+       (vtrash_transfer_messages_to):
+       Fix some potential string format crashes.
+
 2008-10-31  Sankar P  <psankar@novell.com>
 
        ** Fix for bnc bugs #440502, #209514, #434958, #434946, 

diff --git a/camel/camel-vtrash-folder.c b/camel/camel-vtrash-folder.c
index 3eec788..27a691d 100644 (file)
--- a/camel/camel-vtrash-folder.c
+++ b/camel/camel-vtrash-folder.c
@@ -208,7 +208,7 @@ vtrash_append_message (CamelFolder *folder, CamelMimeMessage *message,
                       const CamelMessageInfo *info, char **appended_uid,
                       CamelException *ex)
 {
-       camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, 
+       camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, "%s",
                             _(vdata[((CamelVTrashFolder *)folder)->type].error_copy));
 }
 
@@ -257,7 +257,7 @@ vtrash_transfer_messages_to (CamelFolder *source, GPtrArray *uids,
        if (CAMEL_IS_VTRASH_FOLDER (dest)) {
                /* Copy to trash is meaningless. */
                if (!delete_originals) {
-                       camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, 
+                       camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, "%s",
                                             _(vdata[((CamelVTrashFolder *)dest)->type].error_copy));
                        return;
                }

diff --git a/libebackend/e-data-server-module.c b/libebackend/e-data-server-module.c
index b68384b..3adb2ce 100644 (file)
--- a/libebackend/e-data-server-module.c
+++ b/libebackend/e-data-server-module.c
@@ -77,7 +77,7 @@ e_data_server_module_load (GTypeModule *gmodule)
        module->library = g_module_open (module->path, G_MODULE_BIND_LAZY);
 
        if (!module->library) {
-               g_warning (g_module_error ());
+               g_warning ("%s", g_module_error ());
                return FALSE;
        }
 
@@ -91,7 +91,7 @@ e_data_server_module_load (GTypeModule *gmodule)
                              "eds_module_list_types",
                              (gpointer *)&module->list_types)) {
 
-               g_warning (g_module_error ());
+               g_warning ("%s", g_module_error ());
                g_module_close (module->library);
 
                return FALSE;

diff --git a/servers/groupwise/ChangeLog b/servers/groupwise/ChangeLog
index 0f8f9d8..247fc99 100644 (file)
--- a/servers/groupwise/ChangeLog
+++ b/servers/groupwise/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-31  Matthew Barnes  <mbarnes@redhat.com>
+
+       ** Fixes part of bug #558727 (crash by Frederic van Starbmann)
+
+       * create-account.c (add_account):
+       Fix a potential string format crash.
+
 2008-10-31  Sankar P  <psankar@novell.com>
 
        ** Fix for bnc bugs #440502, #209514, #434958, #434946, 

diff --git a/servers/groupwise/create-account.c b/servers/groupwise/create-account.c
index b8ca5d3..8b71ee4 100644 (file)
--- a/servers/groupwise/create-account.c
+++ b/servers/groupwise/create-account.c
@@ -18,7 +18,7 @@ add_account (const char *conf_key, const char *hostname, const char *username)
 
        source_list = e_source_list_new_for_gconf (conf_client, conf_key);
 
-       group_name = g_strdup_printf (hostname);
+       group_name = g_strdup (hostname);
        group = e_source_group_new (group_name, "groupwise://");
        e_source_list_add_group (source_list, group, -1);