diff options
| -rw-r--r-- | mail/ChangeLog | 7 | ||||
| -rw-r--r-- | mail/em-format-html.c | 2 | ||||
| -rw-r--r-- | plugins/mail-to-task/ChangeLog | 7 | ||||
| -rw-r--r-- | plugins/mail-to-task/mail-to-task.c | 2 | ||||
| -rw-r--r-- | plugins/plugin-manager/ChangeLog | 7 | ||||
| -rw-r--r-- | plugins/plugin-manager/plugin-manager.c | 2 |
6 files changed, 24 insertions, 3 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index af4484e795..3305c700dd 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,10 @@ +2008-10-31 Matthew Barnes <mbarnes@redhat.com> + + ** Fixes part of bug #558726 (patch by Frederic van Starbmann) + + * em-format-html.c (emfh_multipart_related_check): + Fix a potential format string crash. + 2008-10-31 Sankar P <psankar@novell.com> ** Patch by Bharath Acharya <abharath@novell.com> diff --git a/mail/em-format-html.c b/mail/em-format-html.c index caa5c0f51c..98badf5e70 100644 --- a/mail/em-format-html.c +++ b/mail/em-format-html.c @@ -1060,7 +1060,7 @@ emfh_multipart_related_check(struct _EMFormatHTMLJob *job, int cancelled) if (puri->use_count == 0) { d(printf("part '%s' '%s' used '%d'\n", puri->uri?puri->uri:"", puri->cid, puri->use_count)); if (puri->func == emfh_write_related) { - g_string_printf(((EMFormat *)job->format)->part_id, puri->part_id); + g_string_printf(((EMFormat *)job->format)->part_id, "%s", puri->part_id); em_format_part((EMFormat *)job->format, (CamelStream *)job->stream, puri->part); } /* else it was probably added by a previous format this loop */ diff --git a/plugins/mail-to-task/ChangeLog b/plugins/mail-to-task/ChangeLog index 7b9ac83950..ad020a8f0c 100644 --- a/plugins/mail-to-task/ChangeLog +++ b/plugins/mail-to-task/ChangeLog @@ -1,3 +1,10 @@ +2008-10-31 Matthew Barnes <mbarnes@redhat.com> + + ** Fixes part of bug #558726 (patch by Frederic van Starbmann) + + * mail-to-task.c (do_mail_to_task): + Fix a potential format string crash. + 2008-08-27 Sankar P <psankar@novell.com> License Changes diff --git a/plugins/mail-to-task/mail-to-task.c b/plugins/mail-to-task/mail-to-task.c index 89075dfd28..2717bb29be 100644 --- a/plugins/mail-to-task/mail-to-task.c +++ b/plugins/mail-to-task/mail-to-task.c @@ -287,7 +287,7 @@ do_mail_to_task (AsyncData *data) e_notice (NULL, GTK_MESSAGE_ERROR, _("Cannot open calendar. %s"), err ? err->message : ""); } else if (!e_cal_is_read_only (client, &readonly, &err) || readonly) { if (err) - e_notice (NULL, GTK_MESSAGE_ERROR, err->message); + e_notice (NULL, GTK_MESSAGE_ERROR, "%s", err->message); else e_notice (NULL, GTK_MESSAGE_ERROR, _("Selected source is read only, thus cannot create task there. Select other source, please.")); } else { diff --git a/plugins/plugin-manager/ChangeLog b/plugins/plugin-manager/ChangeLog index 1b3d52084a..45dd1105d6 100644 --- a/plugins/plugin-manager/ChangeLog +++ b/plugins/plugin-manager/ChangeLog @@ -1,3 +1,10 @@ +2008-10-31 Matthew Barnes <mbarnes@redhat.com> + + ** Fixes part of bug #558726 (patch by Frederic van Starbmann) + + * plugin-manager.c (eppm_enable_toggled): + Fix a potential format string crash. + 2008-09-04 Sankar P <psankar@novell.com> License Changes diff --git a/plugins/plugin-manager/plugin-manager.c b/plugins/plugin-manager/plugin-manager.c index 4658291679..19af3eeb7e 100644 --- a/plugins/plugin-manager/plugin-manager.c +++ b/plugins/plugin-manager/plugin-manager.c @@ -196,7 +196,7 @@ eppm_enable_toggled (GtkCellRendererToggle *renderer, const char *path_string, M gtk_tree_model_get (m->model, &iter, COL_PLUGIN_DATA, &plugin, -1); e_plugin_enable (plugin, !plugin->enabled); - g_warning (plugin->name); + g_warning ("%s", plugin->name); gtk_list_store_set (GTK_LIST_STORE(m->model), &iter, COL_PLUGIN_ENABLED, plugin->enabled, |