Attachment 32961 Details for Bug 72801

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

sylpheed-claws-0.9.12-mimedecoding-sec2.diff (text/plain), 10.37 KB, created by Thomas Biege on 2005-03-31 07:48:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Biege

Created: 2005-03-31 07:48:28 UTC

Size: 10.37 KB

patch

obsolete

>diff -ur sylpheed-0.9.2.orig/src/codeconv.c src/codeconv.c
>--- sylpheed-0.9.2.orig/src/codeconv.c	2004-06-28 18:03:21.000000000 +0200
>+++ sylpheed-0.9.2.sec/src/codeconv.c	2005-03-23 14:31:20.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,12 +1464,12 @@
> 		buflen = strlen(str) * 2 + 1;
> 		Xalloca(buf, buflen, return);
> 		conv_anytodisp(buf, buflen, str);
>-		unmime_header(str, buf);
>+		unmime_header(str, buf, strsize);
> 	} else {
> 		buflen = strlen(str) + 1;
> 		Xalloca(buf, buflen, return);
>-		unmime_header(buf, str);
>-		strncpy2(str, buf, buflen);
>+		unmime_header(buf, str, buflen);
>+		strncpy2(str, buf, strsize);
> 	}
> }
> 
>@@ -1478,6 +1478,8 @@
> {
> 	CharSet cur_charset;
> 
>+	g_return_if_fail(str != NULL);
>+
> 	cur_charset = conv_get_current_charset();
> 
> 	if (cur_charset == C_EUC_JP) {
>@@ -1487,9 +1489,9 @@
> 		buflen = strlen(str) * 2 + 1;
> 		Xalloca(buf, buflen, return);
> 		conv_anytodisp(buf, buflen, str);
>-		unmime_header(outbuf, buf);
>+		unmime_header(outbuf, outlen, buf);
> 	} else
>-		unmime_header(outbuf, str);
>+		unmime_header(outbuf, outlen, str);
> }
> 
> #define MAX_LINELEN		76
>diff -ur sylpheed-0.9.2.orig/src/codeconv.h src/codeconv.h
>--- sylpheed-0.9.2.orig/src/codeconv.h	2004-06-28 18:03:21.000000000 +0200
>+++ sylpheed-0.9.2.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-0.9.2.orig/src/compose.c src/compose.c
>--- sylpheed-0.9.2.orig/src/compose.c	2004-06-28 18:03:21.000000000 +0200
>+++ sylpheed-0.9.2.sec/src/compose.c	2005-03-23 12:39:07.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-0.9.2.orig/src/procmime.c src/procmime.c
>--- sylpheed-0.9.2.orig/src/procmime.c	2004-06-28 18:03:22.000000000 +0200
>+++ sylpheed-0.9.2.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 -urN sylpheed-0.9.2.orig/src/account.c sylpheed-1.0.4/src/account.c
>--- sylpheed-0.9.2.orig/src/account.c	2004-12-22 16:19:09.000000000 +0900
>+++ sylpheed-0.9.2.sec/src/account.c	2005-03-18 14:01:54.000000000 +0900
>@@ -256,7 +256,8 @@
> {
> 	static HeaderEntry hentry[] = {{"From:",		  NULL, FALSE},
> 				       {"X-Sylpheed-Account-Id:", NULL, FALSE},
>-				       {"AID:",			  NULL, FALSE}};
>+				       {"AID:",			  NULL, FALSE},
>+				       {NULL,			  NULL, FALSE}};
> 
> 	enum
> 	{
>diff -urN sylpheed-0.9.2.orig/src/procmime.c sylpheed-1.0.4/src/procmime.c
>--- sylpheed-0.9.2.orig/src/procmime.c	2004-11-15 16:34:22.000000000 +0900
>+++ sylpheed-0.9.2.sec/src/procmime.c	2005-03-24 13:42:42.000000000 +0900
>@@ -398,12 +398,10 @@
> 			if (!strcasecmp(attr, "charset"))
> 				mimeinfo->charset = g_strdup(value);
> 			else if (!strcasecmp(attr, "name")) {
>-				gchar *tmp;
>-				size_t len;
>+				gchar tmp[BUFFSIZE];
> 
>-				len = strlen(value) + 1;
>-				Xalloca(tmp, len, return);
>-				conv_unmime_header(tmp, len, value, NULL);
>+				conv_unmime_header(tmp, sizeof(tmp), value,
>+						   NULL);
> 				mimeinfo->name = g_strdup(tmp);
> 			} else if (!strcasecmp(attr, "boundary"))
> 				mimeinfo->boundary = g_strdup(value);
>@@ -461,12 +459,10 @@
> 
> 		if (*value) {
> 			if (!strcasecmp(attr, "filename")) {
>-				gchar *tmp;
>-				size_t len;
>+				gchar tmp[BUFFSIZE];
> 
>-				len = strlen(value) + 1;
>-				Xalloca(tmp, len, return);
>-				conv_unmime_header(tmp, len, value, NULL);
>+				conv_unmime_header(tmp, sizeof(tmp), value,
>+						   NULL);
> 				g_free(mimeinfo->filename);
> 				mimeinfo->filename = g_strdup(tmp);
> 				break;
>diff -urN sylpheed-0.9.2.orig/src/smtp.c sylpheed-1.0.4/src/smtp.c
>--- sylpheed-0.9.2.orig/src/smtp.c	2004-05-21 14:29:07.000000000 +0900
>+++ sylpheed-0.9.2.sec/src/smtp.c	2005-03-18 15:15:37.000000000 +0900
>@@ -266,7 +266,7 @@
> 		const gchar *p = msg;
> 		p += 3;
> 		if (*p == '-' || *p == ' ') p++;
>-		if (g_strncasecmp(p, "AUTH", 4) == 0) {
>+		if (g_strncasecmp(p, "AUTH", 4) == 0 && p[4] != '\0') {
> 			p += 5;
> 			if (strcasestr(p, "LOGIN"))
> 				session->avail_auth_type |= SMTPAUTH_LOGIN;
>diff -urN sylpheed-0.9.2.orig/src/textview.c sylpheed-1.0.4/src/textview.c
>--- sylpheed-0.9.2.orig/src/textview.c	2005-01-28 16:44:19.000000000 +0900
>+++ sylpheed-0.9.2.sec/src/textview.c	2005-03-18 14:58:47.000000000 +0900
>@@ -678,6 +678,8 @@
> 		else
> 			textview_write_line(textview, str, NULL);
> 	}
>+	textview_write_line(textview, "\n", NULL);
>+
> 	html_parser_destroy(parser);
> }
> 
>diff -urN sylpheed-0.9.2.orig/src/unmime.c sylpheed-1.0.4/src/unmime.c
>--- sylpheed-0.9.2.orig/src/unmime.c	2004-01-28 15:31:02.000000000 +0900
>+++ sylpheed-0.9.2.sec/src/unmime.c	2005-03-23 21:38:57.000000000 +0900
>@@ -28,13 +28,14 @@
> #include "codeconv.h"
> #include "base64.h"
> #include "quoted-printable.h"
>+#include "utils.h"
> 
> #define ENCODED_WORD_BEGIN	"=?"
> #define ENCODED_WORD_END	"?="
> 
> /* Decodes headers based on RFC2045 and RFC2047. */
> 
>-void unmime_header(gchar *out, const gchar *str)
>+void unmime_header(gchar *out, gint outlen, const gchar *str)
> {
> 	const gchar *p = str;
> 	gchar *outp = out;
>@@ -50,28 +51,33 @@
> 
> 		eword_begin_p = strstr(p, ENCODED_WORD_BEGIN);
> 		if (!eword_begin_p) {
>-			strcpy(outp, p);
>+			strncpy2(outp, p, outlen);
> 			return;
> 		}
> 		encoding_begin_p = strchr(eword_begin_p + 2, '?');
> 		if (!encoding_begin_p) {
>-			strcpy(outp, p);
>+			strncpy2(outp, p, outlen);
> 			return;
> 		}
> 		text_begin_p = strchr(encoding_begin_p + 1, '?');
> 		if (!text_begin_p) {
>-			strcpy(outp, p);
>+			strncpy2(outp, p, outlen);
> 			return;
> 		}
> 		eword_end_p = strstr(text_begin_p + 1, ENCODED_WORD_END);
> 		if (!eword_end_p) {
>-			strcpy(outp, p);
>+			strncpy2(outp, p, outlen);
> 			return;
> 		}
> 
> 		if (p == str) {
>+			if (eword_begin_p - p > outlen - 1) {
>+				strncpy2(outp, p, outlen);
>+				return;
>+			}
> 			memcpy(outp, p, eword_begin_p - p);
> 			outp += eword_begin_p - p;
>+			outlen -= eword_begin_p - p;
> 			p = eword_begin_p;
> 		} else {
> 			/* ignore spaces between encoded words */
>@@ -79,8 +85,13 @@
> 
> 			for (sp = p; sp < eword_begin_p; sp++) {
> 				if (!isspace(*(const guchar *)sp)) {
>+					if (eword_begin_p - p > outlen - 1) {
>+						strncpy2(outp, p, outlen);
>+						return;
>+					}
> 					memcpy(outp, p, eword_begin_p - p);
> 					outp += eword_begin_p - p;
>+					outlen -= eword_begin_p - p;
> 					p = eword_begin_p;
> 					break;
> 				}
>@@ -106,8 +117,13 @@
> 				(decoded_text, text_begin_p + 1,
> 				 eword_end_p - (text_begin_p + 1));
> 		} else {
>+			if (eword_end_p + 2 - p > outlen - 1) {
>+				strncpy2(outp, p, outlen);
>+				return;
>+			}
> 			memcpy(outp, p, eword_end_p + 2 - p);
> 			outp += eword_end_p + 2 - p;
>+			outlen -= eword_end_p + 2 - p;
> 			p = eword_end_p + 2;
> 			continue;
> 		}
>@@ -116,13 +132,25 @@
> 		conv_str = conv_codeset_strdup(decoded_text, charset, NULL);
> 		if (conv_str) {
> 			len = strlen(conv_str);
>+			if (len > outlen - 1) {
>+				strncpy2(outp, conv_str, outlen);
>+				g_free(conv_str);
>+				g_free(decoded_text);
>+				return;
>+			}
> 			memcpy(outp, conv_str, len);
> 			g_free(conv_str);
> 		} else {
> 			len = strlen(decoded_text);
>+			if (len > outlen - 1) {
>+				conv_localetodisp(outp, outlen, decoded_text);
>+				g_free(decoded_text);
>+				return;
>+			}
> 			conv_localetodisp(outp, len + 1, decoded_text);
> 		}
> 		outp += len;
>+		outlen -= len;
> 
> 		g_free(decoded_text);
> 
>diff -urN sylpheed-0.9.2.orig/src/unmime.h sylpheed-1.0.4/src/unmime.h
>--- sylpheed-0.9.2.orig/src/unmime.h	2002-07-10 18:16:00.000000000 +0900
>+++ sylpheed-0.9.2.sec/src/unmime.h	2005-03-23 21:38:53.000000000 +0900
>@@ -23,6 +23,7 @@
> #include <glib.h>
> 
> void unmime_header			(gchar		*out,
>+					 gint		 len,
> 					 const gchar	*str);
> gint unmime_quoted_printable_line	(gchar		*str);
>

Actions: View | Diff

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