aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog7
-rw-r--r--mail/em-format-html.c2
2 files changed, 8 insertions, 1 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 */