diff options
| author |   Ingo Schwarze <schwarze@openbsd.org> | 2017-07-14 17:16:16 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2017-07-14 17:16:16 +0000 |
| commit | f8acc64e80302314af12fd3d08c5e78149621b0c (patch) | |
| tree | d0316f80d6786205f35b00c24d366641c60c2a8a | |
| parent | 930e10b0663c7eb1d77bc85b84afe95ca1e113a2 (diff) | |
| download | mandoc-f8acc64e80302314af12fd3d08c5e78149621b0c.tar.gz mandoc-f8acc64e80302314af12fd3d08c5e78149621b0c.tar.zst mandoc-f8acc64e80302314af12fd3d08c5e78149621b0c.zip | |
The .Dd and .TH macros must interrupt .ce, too;
fixing tree corruption and assertion failure found by jsg@ with afl(1)
| -rw-r--r-- | roff.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/* $Id: roff.c,v 1.323 2017/07/14 16:49:39 schwarze Exp $ */ +/* $Id: roff.c,v 1.324 2017/07/14 17:16:16 schwarze Exp $ */ /* * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010-2015, 2017 Ingo Schwarze <schwarze@openbsd.org> @@ -1559,7 +1559,8 @@ roff_parseln(struct roff *r, int ln, struct buf *buf, int *offs) /* For now, let high level macros abort .ce mode. */ if (ctl && roffce_node != NULL && - (t == TOKEN_NONE || t == ROFF_EQ || t == ROFF_TS)) { + (t == TOKEN_NONE || t == ROFF_Dd || t == ROFF_EQ || + t == ROFF_TH || t == ROFF_TS)) { r->man->last = roffce_node; r->man->next = ROFF_NEXT_SIBLING; roffce_lines = 0; |