Attachment 231403 Details for Bug 208261 – my local patches against stable/13

[patch] my local patches against stable/13

dma.diff (text/plain), 1.04 KB, created by Helge Oldach on 2022-01-28 05:52:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Helge Oldach

Created: 2022-01-28 05:52:09 UTC

Size: 1.04 KB

patch

obsolete

>diff --git a/contrib/dma/mail.c b/contrib/dma/mail.c
>index ad928272e1a..6a6affff8cc 100644
>--- a/contrib/dma/mail.c
>+++ b/contrib/dma/mail.c
>@@ -351,20 +351,20 @@ writeline(struct queue *queue, const char *line, ssize_t linelen)
> 
> 	while (linelen > 0) {
> 		len = linelen;
>-		if (linelen > MAX_LINE_RFC822) {
>-			len = MAX_LINE_RFC822 - 10;
>+		if (linelen >= MAX_LINE_RFC822) {
>+			len = MAX_LINE_RFC822 - 2;
> 		}
> 
> 		if (fwrite(line, len, 1, queue->mailf) != 1)
> 			return (-1);
> 
>-		if (linelen <= MAX_LINE_RFC822)
>+		if (linelen < MAX_LINE_RFC822)
> 			break;
> 
> 		if (fwrite("\n", 1, 1, queue->mailf) != 1)
> 			return (-1);
> 
>-		line += MAX_LINE_RFC822 - 10;
>+		line += MAX_LINE_RFC822 - 2;
> 		linelen = strlen(line);
> 	}
> 	return (0);
>@@ -408,7 +408,7 @@ readmail(struct queue *queue, int nodot, int recp_from_header)
> 			break;
> 
> 		if (!had_headers) {
>-			if (linelen > MAX_LINE_RFC822) {
>+			if (linelen >= MAX_LINE_RFC822) {
> 				/* XXX also split headers */
> 				errlogx(EX_DATAERR, "bad mail input format:"
> 				    " from %s (uid %d) (envelope-from %s)",

Actions: View | Diff

Attachments on bug 208261: 193466 | 193502 | 196909 | 231403