m_getfld: Shorten fdelimlen by one; it was too long.

The fdelimlen bytes starting at fdelim included a NUL at the end, e.g. 7
for "\nFrom \0".  Other code seems not to expect this and has
conditional bits to work around it, perhaps without understanding why.
All the tests still pass, including with valgrind.

diff --git a/sbr/m_getfld.c b/sbr/m_getfld.c
index 5c5b4a3..b4019b0 100644 (file)
--- a/sbr/m_getfld.c
+++ b/sbr/m_getfld.c
@@ -817,7 +817,7 @@ m_unknown(m_getfld_state_t *gstate, FILE *iob)
     *s->fdelim = '\n';
     s->msg_delim = s->fdelim+1;
     s->edelim = s->msg_delim+1;
     *s->fdelim = '\n';
     s->msg_delim = s->fdelim+1;
     s->edelim = s->msg_delim+1;

-    s->fdelimlen = c + 1;
+    s->fdelimlen = c;

     s->edelimlen = c - 1; /* == strlen (delimstr) */
     strcpy (s->msg_delim, delimstr);
     s->delimend = s->msg_delim + s->edelimlen;
     s->edelimlen = c - 1; /* == strlen (delimstr) */
     strcpy (s->msg_delim, delimstr);
     s->delimend = s->msg_delim + s->edelimlen;