aboutsummaryrefslogtreecommitdiffstats
path: root/camel
diff options
context:
space:
mode:
Diffstat (limited to 'camel')
-rw-r--r--camel/ChangeLog3
-rw-r--r--camel/camel-charset-map.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index 23f21bccff..3b557d9b03 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,5 +1,8 @@
2003-02-24 Jeffrey Stedfast <fejj@ximian.com>
+ * camel-charset-map.c (camel_charset_canonical_name): g_alloca
+ (strlen (charset) + 1) so we don't overflow the buffer.
+
* providers/pop3/camel-pop3-stream.c (stream_write): Don't write
the passwd, fixes "bug" #38601.
diff --git a/camel/camel-charset-map.c b/camel/camel-charset-map.c
index 5fcd490dde..3ae00a5fb8 100644
--- a/camel/camel-charset-map.c
+++ b/camel/camel-charset-map.c
@@ -400,7 +400,7 @@ camel_charset_canonical_name (const char *charset)
if (charset == NULL)
return NULL;
- name = g_alloca (strlen (charset));
+ name = g_alloca (strlen (charset) + 1);
strcpy (name, charset);
g_ascii_strdown (name, -1);