check for crlf in m_getfld2

[mmh] / sbr / m_getfld2.c

diff --git a/sbr/m_getfld2.c b/sbr/m_getfld2.c
index 488a445..b9a618d 100644 (file)
--- 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;