mdocml: Drop leading, internal, and trailing blank characters in \o

mdocml: Drop leading, internal, and trailing blank characters in \o

[schwarze]

Log Message:
-----------
Drop leading, internal, and trailing blank characters in \o (overstrike)
escape sequences; that's cleaner for all output modes, and it's required
to prevent the PostScript/PDF formatter from dying on assertions.
Bug found by jsg@ with afl.

Modified Files:
--------------
    mdocml:
        term.c

Revision Data
-------------
Index: term.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/term.c,v
retrieving revision 1.248
retrieving revision 1.249
diff -Lterm.c -Lterm.c -u -p -r1.248 -r1.249
--- term.c
+++ term.c
@@ -499,6 +499,9 @@ term_word(struct termp *p, const char *w
 						p->flags |= TERMP_BACKBEFORE;
 				}
 			}
+			/* Trim trailing backspace/blank pair. */
+			if (p->col > 2 && p->buf[p->col - 1] == ' ')
+				p->col -= 2;
 			continue;
 		default:
 			continue;
@@ -561,7 +564,10 @@ encode1(struct termp *p, int c)
 	    p->fontq[p->fonti] : TERMFONT_NONE;
 
 	if (p->flags & TERMP_BACKBEFORE) {
-		p->buf[p->col++] = 8;
+		if (p->buf[p->col - 1] == ' ')
+			p->col--;
+		else
+			p->buf[p->col++] = 8;
 		p->flags &= ~TERMP_BACKBEFORE;
 	}
 	if (TERMFONT_UNDER == f || TERMFONT_BI == f) {
--
 To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv