X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Fm_getfld2.c;h=b9a618d166e245a37854003610f5a9cb1576ef0c;hp=956a5565485ac54f6ed521db538741076a232e57;hb=1642d62841486ade88ec2c48dd581e3249c98c94;hpb=18b08c1d08cc93b6d86c4e71013e5f8dd3ea103b

diff --git a/sbr/m_getfld2.c b/sbr/m_getfld2.c
index 956a556..b9a618d 100644
--- a/sbr/m_getfld2.c
+++ b/sbr/m_getfld2.c
@@ -62,7 +62,8 @@ m_getfld2(enum state s, struct field *f, FILE *msg)
 			}
 		}
 
-		if (nchars >= NAMESZ) {
+		f->crlf = (nchars > 2 && tmpline[nchars-2] == '\r');
+		if (nchars > NAMESZ+1 || (!f->crlf && nchars > NAMESZ)) {
 			ret = LENERR2;
 		}
 
@@ -103,7 +104,7 @@ m_getfld2(enum state s, struct field *f, FILE *msg)
 				return IOERR2;
 			}
 
-			if (nchars >= NAMESZ) {
+			if (nchars > NAMESZ+1 || (!f->crlf && nchars > NAMESZ)) {
 				ret = LENERR2;
 			}
 
@@ -145,6 +146,7 @@ m_getfld2(enum state s, struct field *f, FILE *msg)
 			}
 		}
 
+		f->crlf = (nchars > 2 && tmpline[nchars-2] == '\r');
 		free(f->value);
 		f->value = tmpline;
 		f->valuelen = nchars;