Attachment #32979 for bug #72801

View | Details | Raw Unified | Return to bug 72801
Collapse All | Expand All

Lines 1450-1456 Link Here

(-)sylpheed-0.9.2.orig/src/codeconv.c (-6 / +8 lines)
1450	return cur_locale;	1450	return cur_locale;
1451	}	1451	}
1452		1452
1453	void conv_unmime_header_overwrite(gchar *str)	1453	void conv_unmime_header_overwrite(gchar *str, size_t strsize)
1454	{	1454	{
1455	gchar *buf;	1455	gchar *buf;
1456	gint buflen;	1456	gint buflen;
Lines 1464-1475 Link Here
1464	buflen = strlen(str) * 2 + 1;	1464	buflen = strlen(str) * 2 + 1;
1465	Xalloca(buf, buflen, return);	1465	Xalloca(buf, buflen, return);
1466	conv_anytodisp(buf, buflen, str);	1466	conv_anytodisp(buf, buflen, str);
1467	unmime_header(str, buf);	1467	unmime_header(str, buf, strsize);
1468	} else {	1468	} else {
1469	buflen = strlen(str) + 1;	1469	buflen = strlen(str) + 1;
1470	Xalloca(buf, buflen, return);	1470	Xalloca(buf, buflen, return);
1471	unmime_header(buf, str);	1471	unmime_header(buf, str, buflen);
1472	strncpy2(str, buf, buflen);	1472	strncpy2(str, buf, strsize);
1473	}	1473	}
1474	}	1474	}
1475		1475
Lines 1478-1483 Link Here
1478	{	1478	{
1479	CharSet cur_charset;	1479	CharSet cur_charset;
1480		1480
		1481	g_return_if_fail(str != NULL);
		1482
1481	cur_charset = conv_get_current_charset();	1483	cur_charset = conv_get_current_charset();
1482		1484
1483	if (cur_charset == C_EUC_JP) {	1485	if (cur_charset == C_EUC_JP) {
Lines 1487-1495 Link Here
1487	buflen = strlen(str) * 2 + 1;	1489	buflen = strlen(str) * 2 + 1;
1488	Xalloca(buf, buflen, return);	1490	Xalloca(buf, buflen, return);
1489	conv_anytodisp(buf, buflen, str);	1491	conv_anytodisp(buf, buflen, str);
1490	unmime_header(outbuf, buf);	1492	unmime_header(outbuf, outlen, buf);
1491	} else	1493	} else
1492	unmime_header(outbuf, str);	1494	unmime_header(outbuf, outlen, str);
1493	}	1495	}
1494		1496
1495	#define MAX_LINELEN 76	1497	#define MAX_LINELEN 76

Lines 216-222 Link Here

(-)sylpheed-0.9.2.orig/src/codeconv.h (-1 / +1 lines)
216		216
217	const gchar *conv_get_current_locale (void);	217	const gchar *conv_get_current_locale (void);
218		218
219	void conv_unmime_header_overwrite (gchar *str);	219	void conv_unmime_header_overwrite (gchar *str, size_t strsize);
220	void conv_unmime_header (gchar *outbuf,	220	void conv_unmime_header (gchar *outbuf,
221	gint outlen,	221	gint outlen,
222	const gchar *str,	222	const gchar *str,




	fclose(fp);

	if (hentry[H_REPLY_TO].body != NULL) {
		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, strlen(hentry[H_CC].body));
		compose->cc = hentry[H_CC].body;
		hentry[H_CC].body = NULL;
	}

	}
	if (hentry[H_BCC].body != NULL) {
		if (compose->mode == COMPOSE_REEDIT) {
			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, 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, strlen(hentry[H_FOLLOWUP_TO].body));
		compose->followup_to = hentry[H_FOLLOWUP_TO].body;
		hentry[H_FOLLOWUP_TO].body = NULL;
	}

Lines 678-683 Link Here

(-)sylpheed-0.9.2.orig/src/textview.c (+2 lines)
678	else	678	else
679	textview_write_line(textview, str, NULL);	679	textview_write_line(textview, str, NULL);
680	}	680	}
		681	textview_write_line(textview, "\n", NULL);
		682
681	html_parser_destroy(parser);	683	html_parser_destroy(parser);
682	}	684	}
683		685




#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, gint outlen, const gchar *str)
{
	const gchar *p = str;
	gchar *outp = out;


		eword_begin_p = strstr(p, ENCODED_WORD_BEGIN);
		if (!eword_begin_p) {
			strncpy2(outp, p, outlen);
			return;
		}
		encoding_begin_p = strchr(eword_begin_p + 2, '?');
		if (!encoding_begin_p) {
			strncpy2(outp, p, outlen);
			return;
		}
		text_begin_p = strchr(encoding_begin_p + 1, '?');
		if (!text_begin_p) {
			strncpy2(outp, p, outlen);
			return;
		}
		eword_end_p = strstr(text_begin_p + 1, ENCODED_WORD_END);
		if (!eword_end_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 */


			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;
				}

				(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;
		}

		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);


Lines 23-28 Link Here

(-)sylpheed-0.9.2.orig/src/unmime.h (+1 lines)
23	#include <glib.h>	23	#include <glib.h>
24		24
25	void unmime_header (gchar *out,	25	void unmime_header (gchar *out,
		26	gint len,
26	const gchar *str);	27	const gchar *str);
27	gint unmime_quoted_printable_line (gchar *str);	28	gint unmime_quoted_printable_line (gchar *str);
28		29

Return to bug 72801

Lines 1595-1606 Link Here

(-)sylpheed-0.9.2.orig/src/compose.c (-5 / +5 lines)
1595	fclose(fp);	1595	fclose(fp);
1596		1596
1597	if (hentry[H_REPLY_TO].body != NULL) {	1597	if (hentry[H_REPLY_TO].body != NULL) {
1598	conv_unmime_header_overwrite(hentry[H_REPLY_TO].body);	1598	conv_unmime_header_overwrite(hentry[H_REPLY_TO].body, strlen(hentry[H_REPLY_TO].body));
1599	compose->replyto = hentry[H_REPLY_TO].body;	1599	compose->replyto = hentry[H_REPLY_TO].body;
1600	hentry[H_REPLY_TO].body = NULL;	1600	hentry[H_REPLY_TO].body = NULL;
1601	}	1601	}
1602	if (hentry[H_CC].body != NULL) {	1602	if (hentry[H_CC].body != NULL) {
1603	conv_unmime_header_overwrite(hentry[H_CC].body);	1603	conv_unmime_header_overwrite(hentry[H_CC].body, strlen(hentry[H_CC].body));
1604	compose->cc = hentry[H_CC].body;	1604	compose->cc = hentry[H_CC].body;
1605	hentry[H_CC].body = NULL;	1605	hentry[H_CC].body = NULL;
1606	}	1606	}
Lines 1616-1634 Link Here
1616	}	1616	}
1617	if (hentry[H_BCC].body != NULL) {	1617	if (hentry[H_BCC].body != NULL) {
1618	if (compose->mode == COMPOSE_REEDIT) {	1618	if (compose->mode == COMPOSE_REEDIT) {
1619	conv_unmime_header_overwrite(hentry[H_BCC].body);	1619	conv_unmime_header_overwrite(hentry[H_BCC].body, strlen(hentry[H_BCC].body));
1620	compose->bcc = hentry[H_BCC].body;	1620	compose->bcc = hentry[H_BCC].body;
1621	} else	1621	} else
1622	g_free(hentry[H_BCC].body);	1622	g_free(hentry[H_BCC].body);
1623	hentry[H_BCC].body = NULL;	1623	hentry[H_BCC].body = NULL;
1624	}	1624	}
1625	if (hentry[H_NEWSGROUPS].body != NULL) {	1625	if (hentry[H_NEWSGROUPS].body != NULL) {
1626	conv_unmime_header_overwrite(hentry[H_NEWSGROUPS].body);	1626	conv_unmime_header_overwrite(hentry[H_NEWSGROUPS].body, strlen(hentry[H_NEWSGROUPS].body));
1627	compose->newsgroups = hentry[H_NEWSGROUPS].body;	1627	compose->newsgroups = hentry[H_NEWSGROUPS].body;
1628	hentry[H_NEWSGROUPS].body = NULL;	1628	hentry[H_NEWSGROUPS].body = NULL;
1629	}	1629	}
1630	if (hentry[H_FOLLOWUP_TO].body != NULL) {	1630	if (hentry[H_FOLLOWUP_TO].body != NULL) {
1631	conv_unmime_header_overwrite(hentry[H_FOLLOWUP_TO].body);	1631	conv_unmime_header_overwrite(hentry[H_FOLLOWUP_TO].body, strlen(hentry[H_FOLLOWUP_TO].body));
1632	compose->followup_to = hentry[H_FOLLOWUP_TO].body;	1632	compose->followup_to = hentry[H_FOLLOWUP_TO].body;
1633	hentry[H_FOLLOWUP_TO].body = NULL;	1633	hentry[H_FOLLOWUP_TO].body = NULL;
1634	}	1634	}

Lines 28-40 Link Here

(-)sylpheed-0.9.2.orig/src/unmime.c (-5 / +33 lines)
28	#include "codeconv.h"	28	#include "codeconv.h"
29	#include "base64.h"	29	#include "base64.h"
30	#include "quoted-printable.h"	30	#include "quoted-printable.h"
		31	#include "utils.h"
31		32
32	#define ENCODED_WORD_BEGIN "=?"	33	#define ENCODED_WORD_BEGIN "=?"
33	#define ENCODED_WORD_END "?="	34	#define ENCODED_WORD_END "?="
34		35
35	/* Decodes headers based on RFC2045 and RFC2047. */	36	/* Decodes headers based on RFC2045 and RFC2047. */
36		37
37	void unmime_header(gchar out, const gchar str)	38	void unmime_header(gchar out, gint outlen, const gchar str)
38	{	39	{
39	const gchar *p = str;	40	const gchar *p = str;
40	gchar *outp = out;	41	gchar *outp = out;
Lines 50-77 Link Here
50		51
51	eword_begin_p = strstr(p, ENCODED_WORD_BEGIN);	52	eword_begin_p = strstr(p, ENCODED_WORD_BEGIN);
52	if (!eword_begin_p) {	53	if (!eword_begin_p) {
53	strcpy(outp, p);	54	strncpy2(outp, p, outlen);
54	return;	55	return;
55	}	56	}
56	encoding_begin_p = strchr(eword_begin_p + 2, '?');	57	encoding_begin_p = strchr(eword_begin_p + 2, '?');
57	if (!encoding_begin_p) {	58	if (!encoding_begin_p) {
58	strcpy(outp, p);	59	strncpy2(outp, p, outlen);
59	return;	60	return;
60	}	61	}
61	text_begin_p = strchr(encoding_begin_p + 1, '?');	62	text_begin_p = strchr(encoding_begin_p + 1, '?');
62	if (!text_begin_p) {	63	if (!text_begin_p) {
63	strcpy(outp, p);	64	strncpy2(outp, p, outlen);
64	return;	65	return;
65	}	66	}
66	eword_end_p = strstr(text_begin_p + 1, ENCODED_WORD_END);	67	eword_end_p = strstr(text_begin_p + 1, ENCODED_WORD_END);
67	if (!eword_end_p) {	68	if (!eword_end_p) {
68	strcpy(outp, p);	69	strncpy2(outp, p, outlen);
69	return;	70	return;
70	}	71	}
71		72
72	if (p == str) {	73	if (p == str) {
		74	if (eword_begin_p - p > outlen - 1) {
		75	strncpy2(outp, p, outlen);
		76	return;
		77	}
73	memcpy(outp, p, eword_begin_p - p);	78	memcpy(outp, p, eword_begin_p - p);
74	outp += eword_begin_p - p;	79	outp += eword_begin_p - p;
		80	outlen -= eword_begin_p - p;
75	p = eword_begin_p;	81	p = eword_begin_p;
76	} else {	82	} else {
77	/* ignore spaces between encoded words */	83	/* ignore spaces between encoded words */
Lines 79-86 Link Here
79		85
80	for (sp = p; sp < eword_begin_p; sp++) {	86	for (sp = p; sp < eword_begin_p; sp++) {
81	if (!isspace((const guchar )sp)) {	87	if (!isspace((const guchar )sp)) {
		88	if (eword_begin_p - p > outlen - 1) {
		89	strncpy2(outp, p, outlen);
		90	return;
		91	}
82	memcpy(outp, p, eword_begin_p - p);	92	memcpy(outp, p, eword_begin_p - p);
83	outp += eword_begin_p - p;	93	outp += eword_begin_p - p;
		94	outlen -= eword_begin_p - p;
84	p = eword_begin_p;	95	p = eword_begin_p;
85	break;	96	break;
86	}	97	}
Lines 106-113 Link Here
106	(decoded_text, text_begin_p + 1,	117	(decoded_text, text_begin_p + 1,
107	eword_end_p - (text_begin_p + 1));	118	eword_end_p - (text_begin_p + 1));
108	} else {	119	} else {
		120	if (eword_end_p + 2 - p > outlen - 1) {
		121	strncpy2(outp, p, outlen);
		122	return;
		123	}
109	memcpy(outp, p, eword_end_p + 2 - p);	124	memcpy(outp, p, eword_end_p + 2 - p);
110	outp += eword_end_p + 2 - p;	125	outp += eword_end_p + 2 - p;
		126	outlen -= eword_end_p + 2 - p;
111	p = eword_end_p + 2;	127	p = eword_end_p + 2;
112	continue;	128	continue;
113	}	129	}
Lines 116-128 Link Here
116	conv_str = conv_codeset_strdup(decoded_text, charset, NULL);	132	conv_str = conv_codeset_strdup(decoded_text, charset, NULL);
117	if (conv_str) {	133	if (conv_str) {
118	len = strlen(conv_str);	134	len = strlen(conv_str);
		135	if (len > outlen - 1) {
		136	strncpy2(outp, conv_str, outlen);
		137	g_free(conv_str);
		138	g_free(decoded_text);
		139	return;
		140	}
119	memcpy(outp, conv_str, len);	141	memcpy(outp, conv_str, len);
120	g_free(conv_str);	142	g_free(conv_str);
121	} else {	143	} else {
122	len = strlen(decoded_text);	144	len = strlen(decoded_text);
		145	if (len > outlen - 1) {
		146	conv_localetodisp(outp, outlen, decoded_text);
		147	g_free(decoded_text);
		148	return;
		149	}
123	conv_localetodisp(outp, len + 1, decoded_text);	150	conv_localetodisp(outp, len + 1, decoded_text);
124	}	151	}
125	outp += len;	152	outp += len;
		153	outlen -= len;
126		154
127	g_free(decoded_text);	155	g_free(decoded_text);
128		156