X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/79db7961dc654024722449ba51c3b580086eb1a0..df02833a36f5525edb5b274fb67ca46aa4e5e6c5:/sbr/m_getfld.c

diff --git a/sbr/m_getfld.c b/sbr/m_getfld.c
index f84d2933..d278e528 100644
--- a/sbr/m_getfld.c
+++ b/sbr/m_getfld.c
@@ -630,12 +630,21 @@ m_getfld (m_getfld_state_t *gstate, char name[NAMESZ], char *buf, int *bufsz,
 	    n = 0;
 	    for (finished = 0; ! finished; ) {
 		while (c != '\n'  &&  c != EOF  &&  n++ < max) {
-		    *cp++ = c = Getc (s);
+		    if ((c = Getc (s)) != EOF) { *cp++ = c; }
 		}
 
 		if (c != EOF) c = Peek (s);
 		if (max < n) {
-		    /* the dest buffer is full */
+		    /* The dest buffer is full.  Need to back the read
+		       pointer up by one because when m_getfld() is
+		       reentered, it will read a character.  Then
+		       we'll jump right to the FLDPLUS handling code,
+		       which will not store that character, but
+		       instead move on to the next one. */
+		    if (s->readpos > s->msg_buf) {
+			--s->readpos;
+			--s->bytes_read;
+		    }
 		    s->state = FLDPLUS;
 		    finished = 1;
 		} else if (c != ' '  &&  c != '\t') {