Attachment #32650 for bug #72801

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

Lines 1450-1456 Link Here

(-)sylpheed-claws-0.9.12.orig/src/codeconv.c (-1 / +4 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-1469 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	buf[strsize-1] = 0;
1467	unmime_header(str, buf);	1468	unmime_header(str, buf);
1468	} else {	1469	} else {
1469	buflen = strlen(str) + 1;	1470	buflen = strlen(str) + 1;
Lines 1478-1483 Link Here
1478	{	1479	{
1479	CharSet cur_charset;	1480	CharSet cur_charset;
1480		1481
		1482	g_return_if_fail(str != NULL);
		1483
1481	cur_charset = conv_get_current_charset();	1484	cur_charset = conv_get_current_charset();
1482		1485
1483	if (cur_charset == C_EUC_JP) {	1486	if (cur_charset == C_EUC_JP) {

Lines 216-222 Link Here

(-)sylpheed-claws-0.9.12.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;
	}




	fseek(fp, mimeinfo->offset, SEEK_SET);
	procheader_get_header_fields(fp, hentry);
	if (hentry[0].body != NULL)
		conv_unmime_header_overwrite(hentry[0].body, strlen(hentry[0].body));
	if (hentry[2].body != NULL)
		conv_unmime_header_overwrite(hentry[2].body, strlen(hentry[2].body));
	if (hentry[4].body != NULL)
		conv_unmime_header_overwrite(hentry[4].body, strlen(hentry[4].body));
	content_start = ftell(fp);
	fclose(fp);


			}
			procheader_get_header_fields(fp, hentry);
			if (hentry[0].body != NULL)
				conv_unmime_header_overwrite(hentry[0].body, strlen(hentry[0].body));
			if (hentry[2].body != NULL)
				conv_unmime_header_overwrite(hentry[2].body, strlen(hentry[2].body));
			if (hentry[4].body != NULL)
				conv_unmime_header_overwrite(hentry[4].body, strlen(hentry[4].body));
			lastoffset = ftell(fp);
		}
	}

Lines 69-74 Link Here

(-)sylpheed-claws-0.9.12.orig/src/unmime.c (+1 lines)
69	return;	69	return;
70	}	70	}
71		71
		72	// XXX eword begin could be NULL if i'm not wrong
72	if (p == str) {	73	if (p == str) {
73	memcpy(outp, p, eword_begin_p - p);	74	memcpy(outp, p, eword_begin_p - p);
74	outp += eword_begin_p - p;	75	outp += eword_begin_p - p;

Return to bug 72801

Lines 996-1006 Link Here

(-)sylpheed-claws-0.9.12.orig/src/procmime.c (-6 / +6 lines)
996	fseek(fp, mimeinfo->offset, SEEK_SET);	996	fseek(fp, mimeinfo->offset, SEEK_SET);
997	procheader_get_header_fields(fp, hentry);	997	procheader_get_header_fields(fp, hentry);
998	if (hentry[0].body != NULL)	998	if (hentry[0].body != NULL)
999	conv_unmime_header_overwrite(hentry[0].body);	999	conv_unmime_header_overwrite(hentry[0].body, strlen(hentry[0].body));
1000	if (hentry[2].body != NULL)	1000	if (hentry[2].body != NULL)
1001	conv_unmime_header_overwrite(hentry[2].body);	1001	conv_unmime_header_overwrite(hentry[2].body, strlen(hentry[2].body));
1002	if (hentry[4].body != NULL)	1002	if (hentry[4].body != NULL)
1003	conv_unmime_header_overwrite(hentry[4].body);	1003	conv_unmime_header_overwrite(hentry[4].body, strlen(hentry[4].body));
1004	content_start = ftell(fp);	1004	content_start = ftell(fp);
1005	fclose(fp);	1005	fclose(fp);
1006		1006
Lines 1086-1096 Link Here
1086	}	1086	}
1087	procheader_get_header_fields(fp, hentry);	1087	procheader_get_header_fields(fp, hentry);
1088	if (hentry[0].body != NULL)	1088	if (hentry[0].body != NULL)
1089	conv_unmime_header_overwrite(hentry[0].body);	1089	conv_unmime_header_overwrite(hentry[0].body, strlen(hentry[0].body));
1090	if (hentry[2].body != NULL)	1090	if (hentry[2].body != NULL)
1091	conv_unmime_header_overwrite(hentry[2].body);	1091	conv_unmime_header_overwrite(hentry[2].body, strlen(hentry[2].body));
1092	if (hentry[4].body != NULL)	1092	if (hentry[4].body != NULL)
1093	conv_unmime_header_overwrite(hentry[4].body);	1093	conv_unmime_header_overwrite(hentry[4].body, strlen(hentry[4].body));
1094	lastoffset = ftell(fp);	1094	lastoffset = ftell(fp);
1095	}	1095	}
1096	}	1096	}

Lines 1595-1606 Link Here

(-)sylpheed-claws-0.9.12.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	}