Attachment 32650 Details for Bug 72801

[patch] sylpheed-claws-0.9.12-mimedecoding-sec.diff

sylpheed-claws-0.9.12-mimedecoding-sec.diff (text/plain), 4.87 KB, created by Thomas Biege on 2005-03-23 10:46:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Biege

Created: 2005-03-23 10:46:14 UTC

Size: 4.87 KB

patch

obsolete

>diff -ur sylpheed-claws-0.9.12.orig/src/codeconv.c sylpheed-claws-0.9.12.sec/src/codeconv.c
>--- sylpheed-claws-0.9.12.orig/src/codeconv.c	2004-06-28 18:03:21.000000000 +0200
>+++ sylpheed-claws-0.9.12.sec/src/codeconv.c	2005-03-23 10:43:15.000000000 +0100
>@@ -1450,7 +1450,7 @@
> 	return cur_locale;
> }
> 
>-void conv_unmime_header_overwrite(gchar *str)
>+void conv_unmime_header_overwrite(gchar *str, size_t strsize)
> {
> 	gchar *buf;
> 	gint buflen;
>@@ -1464,6 +1464,7 @@
> 		buflen = strlen(str) * 2 + 1;
> 		Xalloca(buf, buflen, return);
> 		conv_anytodisp(buf, buflen, str);
>+		buf[strsize-1] = 0;
> 		unmime_header(str, buf);
> 	} else {
> 		buflen = strlen(str) + 1;
>@@ -1478,6 +1479,8 @@
> {
> 	CharSet cur_charset;
> 
>+	g_return_if_fail(str != NULL);
>+
> 	cur_charset = conv_get_current_charset();
> 
> 	if (cur_charset == C_EUC_JP) {
>diff -ur sylpheed-claws-0.9.12.orig/src/codeconv.h sylpheed-claws-0.9.12.sec/src/codeconv.h
>--- sylpheed-claws-0.9.12.orig/src/codeconv.h	2004-06-28 18:03:21.000000000 +0200
>+++ sylpheed-claws-0.9.12.sec/src/codeconv.h	2005-03-23 09:48:55.000000000 +0100
>@@ -216,7 +216,7 @@
> 
> const gchar *conv_get_current_locale		(void);
> 
>-void conv_unmime_header_overwrite	(gchar		*str);
>+void conv_unmime_header_overwrite	(gchar		*str, size_t strsize);
> void conv_unmime_header			(gchar		*outbuf,
> 					 gint		 outlen,
> 					 const gchar	*str,
>diff -ur sylpheed-claws-0.9.12.orig/src/compose.c sylpheed-claws-0.9.12.sec/src/compose.c
>--- sylpheed-claws-0.9.12.orig/src/compose.c	2004-06-28 18:03:21.000000000 +0200
>+++ sylpheed-claws-0.9.12.sec/src/compose.c	2005-03-23 10:19:56.000000000 +0100
>@@ -1595,12 +1595,12 @@
> 	fclose(fp);
> 
> 	if (hentry[H_REPLY_TO].body != NULL) {
>-		conv_unmime_header_overwrite(hentry[H_REPLY_TO].body);
>+		conv_unmime_header_overwrite(hentry[H_REPLY_TO].body, strlen(hentry[H_REPLY_TO].body));
> 		compose->replyto = hentry[H_REPLY_TO].body;
> 		hentry[H_REPLY_TO].body = NULL;
> 	}
> 	if (hentry[H_CC].body != NULL) {
>-		conv_unmime_header_overwrite(hentry[H_CC].body);
>+		conv_unmime_header_overwrite(hentry[H_CC].body, strlen(hentry[H_CC].body));
> 		compose->cc = hentry[H_CC].body;
> 		hentry[H_CC].body = NULL;
> 	}
>@@ -1616,19 +1616,19 @@
> 	}
> 	if (hentry[H_BCC].body != NULL) {
> 		if (compose->mode == COMPOSE_REEDIT) {
>-			conv_unmime_header_overwrite(hentry[H_BCC].body);
>+			conv_unmime_header_overwrite(hentry[H_BCC].body, strlen(hentry[H_BCC].body));
> 			compose->bcc = hentry[H_BCC].body;
> 		} else
> 			g_free(hentry[H_BCC].body);
> 		hentry[H_BCC].body = NULL;
> 	}
> 	if (hentry[H_NEWSGROUPS].body != NULL) {
>-		conv_unmime_header_overwrite(hentry[H_NEWSGROUPS].body);
>+		conv_unmime_header_overwrite(hentry[H_NEWSGROUPS].body, strlen(hentry[H_NEWSGROUPS].body));
> 		compose->newsgroups = hentry[H_NEWSGROUPS].body;
> 		hentry[H_NEWSGROUPS].body = NULL;
> 	}
> 	if (hentry[H_FOLLOWUP_TO].body != NULL) {
>-		conv_unmime_header_overwrite(hentry[H_FOLLOWUP_TO].body);
>+		conv_unmime_header_overwrite(hentry[H_FOLLOWUP_TO].body, strlen(hentry[H_FOLLOWUP_TO].body));
> 		compose->followup_to = hentry[H_FOLLOWUP_TO].body;
> 		hentry[H_FOLLOWUP_TO].body = NULL;
> 	}
>diff -ur sylpheed-claws-0.9.12.orig/src/procmime.c sylpheed-claws-0.9.12.sec/src/procmime.c
>--- sylpheed-claws-0.9.12.orig/src/procmime.c	2004-06-28 18:03:22.000000000 +0200
>+++ sylpheed-claws-0.9.12.sec/src/procmime.c	2005-03-23 10:22:23.000000000 +0100
>@@ -996,11 +996,11 @@
> 	fseek(fp, mimeinfo->offset, SEEK_SET);
> 	procheader_get_header_fields(fp, hentry);
> 	if (hentry[0].body != NULL)
>-		conv_unmime_header_overwrite(hentry[0].body);
>+		conv_unmime_header_overwrite(hentry[0].body, strlen(hentry[0].body));
> 	if (hentry[2].body != NULL)
>-		conv_unmime_header_overwrite(hentry[2].body);
>+		conv_unmime_header_overwrite(hentry[2].body, strlen(hentry[2].body));
> 	if (hentry[4].body != NULL)
>-		conv_unmime_header_overwrite(hentry[4].body);
>+		conv_unmime_header_overwrite(hentry[4].body, strlen(hentry[4].body));
> 	content_start = ftell(fp);
> 	fclose(fp);
> 
>@@ -1086,11 +1086,11 @@
> 			}
> 			procheader_get_header_fields(fp, hentry);
> 			if (hentry[0].body != NULL)
>-				conv_unmime_header_overwrite(hentry[0].body);
>+				conv_unmime_header_overwrite(hentry[0].body, strlen(hentry[0].body));
> 			if (hentry[2].body != NULL)
>-				conv_unmime_header_overwrite(hentry[2].body);
>+				conv_unmime_header_overwrite(hentry[2].body, strlen(hentry[2].body));
> 			if (hentry[4].body != NULL)
>-				conv_unmime_header_overwrite(hentry[4].body);
>+				conv_unmime_header_overwrite(hentry[4].body, strlen(hentry[4].body));
> 			lastoffset = ftell(fp);
> 		}
> 	}
>diff -ur sylpheed-claws-0.9.12.orig/src/unmime.c sylpheed-claws-0.9.12.sec/src/unmime.c
>--- sylpheed-claws-0.9.12.orig/src/unmime.c	2004-06-28 18:03:20.000000000 +0200
>+++ sylpheed-claws-0.9.12.sec/src/unmime.c	2005-03-23 09:47:54.000000000 +0100
>@@ -69,6 +69,7 @@
> 			return;
> 		}
> 
>+		// XXX eword begin could be NULL if i'm not wrong
> 		if (p == str) {
> 			memcpy(outp, p, eword_begin_p - p);
> 			outp += eword_begin_p - p;

Actions: View | Diff

Attachments on bug 72801: 32650 | 32677 | 32741 | 32961 | 32965 | 32969 | 32979 | 33475