X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Fm_getfld2.c;h=b9a618d166e245a37854003610f5a9cb1576ef0c;hp=488a445cd0da0aa59d54130f36d8c530b20d5863;hb=93fa896ceb5fbebe2f1f6e6e36419a13f8ffd99f;hpb=2fb1dd2271e5be9d0b0c9cbd4e7d6d5d51aaecb9

diff --git a/sbr/m_getfld2.c b/sbr/m_getfld2.c
index 488a445..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,6 +104,10 @@ m_getfld2(enum state s, struct field *f, FILE *msg)
 				return IOERR2;
 			}
 
+			if (nchars > NAMESZ+1 || (!f->crlf && nchars > NAMESZ)) {
+				ret = LENERR2;
+			}
+
 			if (*(tmpline + nchars - 1) != '\n') {
 				ret = FMTERR2;
 			}
@@ -141,10 +146,7 @@ m_getfld2(enum state s, struct field *f, FILE *msg)
 			}
 		}
 
-		if (nchars >= NAMESZ) {
-			ret = LENERR2;
-		}
-
+		f->crlf = (nchars > 2 && tmpline[nchars-2] == '\r');
 		free(f->value);
 		f->value = tmpline;
 		f->valuelen = nchars;