diff options
| author | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2015-01-22 19:26:17 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2015-01-22 19:26:17 +0000 |
| commit | 69ca79d8931cdafd1ded0b0d4294c7acdcda5aed (patch) | |
| tree | f381916d771b4885b2660d33a8dc8b6505c6913a /usr.bin | |
| parent | 14296d89bc90379c8d1e5b6941749403ab681a07 (diff) | |
Don't let a failing mparse_open() clobber the filename pointer;
fixes error message content and a use after free
for .so with non-existent target when -Wall or -Tlint is given.
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/mandoc/read.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/usr.bin/mandoc/read.c b/usr.bin/mandoc/read.c index d07926a7457..1ddd57fb0c3 100644 --- a/usr.bin/mandoc/read.c +++ b/usr.bin/mandoc/read.c @@ -1,4 +1,4 @@ -/* $OpenBSD: read.c,v 1.87 2015/01/20 21:12:46 schwarze Exp $ */ +/* $OpenBSD: read.c,v 1.88 2015/01/22 19:26:16 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org> @@ -302,6 +302,7 @@ mparse_buf_r(struct mparse *curp, struct buf blk, size_t i, int start) { const struct tbl_span *span; struct buf ln; + const char *save_file; char *cp; size_t pos; /* byte number in the ln buffer */ enum rofferr rr; @@ -517,11 +518,14 @@ rerun: */ if (curp->secondary) curp->secondary->sz -= pos + 1; + save_file = curp->file; save_child = curp->child; if (mparse_open(curp, &fd, ln.buf + of) == - MANDOCLEVEL_OK) + MANDOCLEVEL_OK) { mparse_readfd(curp, fd, ln.buf + of); - else { + curp->file = save_file; + } else { + curp->file = save_file; mandoc_vmsg(MANDOCERR_SO_FAIL, curp, curp->line, pos, ".so %s", ln.buf + of); |