diff options
| author | Kristaps Dzonsons <kristaps@bsd.lv> | 2010-03-29 19:45:42 +0000 |
|---|---|---|
| committer | Kristaps Dzonsons <kristaps@bsd.lv> | 2010-03-29 19:45:42 +0000 |
| commit | 45c11bcafa11459f35bb66354fa2c0053791519d (patch) | |
| tree | 468e4434944eab912045fedcdb5485ea2639cf6e | |
| parent | c3b989ab9fc89a8c8b709c612e5f9a40e523c983 (diff) | |
| download | mandoc-45c11bcafa11459f35bb66354fa2c0053791519d.tar.gz | |
Fixed segfault with accidentally-munged tree.
| -rw-r--r-- | mdoc_macro.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/mdoc_macro.c b/mdoc_macro.c index 56e8ad20..4dbe8d81 100644 --- a/mdoc_macro.c +++ b/mdoc_macro.c @@ -904,10 +904,10 @@ blk_full(MACRO_PROT_ARGS) if ( ! mdoc_block_alloc(m, line, ppos, tok, arg)) return(0); + if ( ! mdoc_head_alloc(m, line, ppos, tok)) + return(0); - if (0 == buf[*pos]) { - if ( ! mdoc_head_alloc(m, line, ppos, tok)) - return(0); + if ('\0' == buf[*pos]) { if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos)) return(0); if ( ! mdoc_body_alloc(m, line, ppos, tok)) @@ -915,9 +915,6 @@ blk_full(MACRO_PROT_ARGS) return(1); } - if ( ! mdoc_head_alloc(m, line, ppos, tok)) - return(0); - /* Immediately close out head and enter body, if applicable. */ if (0 == dohead) { @@ -1051,10 +1048,11 @@ blk_part_imp(MACRO_PROT_ARGS) /* Clean-ups to leave in a consistent state. */ - if (NULL == body && ! mdoc_body_alloc(m, line, ppos, tok)) - return(0); - - body = m->last; + if (NULL == body) { + if ( ! mdoc_body_alloc(m, line, ppos, tok)) + return(0); + body = m->last; + } /* * If we can't rewind to our body, then our scope has already |