Downgrade .Bd -file from FATAL to ERROR.

Since this was the last remaining FATAL error in this area,
this change will allow major simplifications in the mdoc(7) parser.

diff --git a/mandoc.1 b/mandoc.1
index 5b66a40d81ebde43b3bb8689b8eeb21bb18b46d2..fdb705f7a363e2f0442cc8f4fab8b59a1c2a26b8 100644 (file)
--- a/mandoc.1
+++ b/mandoc.1
@@ -1,4 +1,4 @@
-.\"    $Id: mandoc.1,v 1.123 2014/11/25 20:18:15 schwarze Exp $
+.\"    $Id: mandoc.1,v 1.124 2014/11/27 23:40:19 schwarze Exp $
 .\"
 .\" Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
 .\" Copyright (c) 2012, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -15,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: November 25 2014 $
+.Dd $Mdocdate: November 27 2014 $
 .Dt MANDOC 1
 .Os
 .Sh NAME
@@ -1396,6 +1396,17 @@ The indicated request or macro has too few or too many arguments.
 The syntax tree will contain the wrong number of arguments as given.
 Formatting behaviour depends on the specific request or macro in question.
 Note that the same message may also occur as a WARNING, see above.
+.It Sy "NOT IMPLEMENTED: Bd -file"
+.Pq mdoc
+For security reasons, the
+.Ic \&Bd
+macro does not support the
+.Fl file
+argument.
+By requesting the inclusion of a sensitive file, a malicious document
+might otherwise trick a privileged user into inadvertently displaying
+the file on the screen, revealing the file content to bystanders.
+The argument is ignored including the file name following it.
 .It Sy "missing list type, using -item"
 .Pq mdoc
 A
@@ -1484,17 +1495,6 @@ cannot handle input files larger than its arbitrary size limit
 of 2^31 bytes (2 Gigabytes).
 Since useful manuals are always small, this is not a problem in practice.
 Parsing is aborted as soon as the condition is detected.
-.It Sy "NOT IMPLEMENTED: Bd -file"
-.Pq mdoc
-For security reasons, the
-.Ic \&Bd
-macro does not support the
-.Fl file
-argument.
-By requesting the inclusion of a sensitive file, a malicious document
-might otherwise trick a privileged user into inadvertently displaying
-the file on the screen, revealing the file content to bystanders.
-The parser exits immediately.
 .It Sy "NOT IMPLEMENTED: .so with absolute path or \(dq..\(dq"
 .Pq roff
 For security reasons,

diff --git a/mandoc.h b/mandoc.h
index 80a7bfc1376b432779b438f6c4afc7bea4ec63d4..728a7bb6845399fb69e6722c1aa95af6dd0d31fd 100644 (file)
--- a/mandoc.h
+++ b/mandoc.h
@@ -1,4 +1,4 @@
-/*     $Id: mandoc.h,v 1.169 2014/11/26 21:40:17 schwarze Exp $ */
+/*     $Id: mandoc.h,v 1.170 2014/11/27 23:40:19 schwarze Exp $ */
 /*
  * Copyright (c) 2010, 2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -159,6 +159,7 @@ enum        mandocerr {
        /* related to request and macro arguments */
        MANDOCERR_NAMESC, /* escaped character not allowed in a name: name */
        MANDOCERR_ARGCOUNT, /* argument count wrong */
+       MANDOCERR_BD_FILE, /* NOT IMPLEMENTED: Bd -file */
        MANDOCERR_BL_NOTYPE, /* missing list type, using -item: Bl */
        MANDOCERR_NM_NONAME, /* missing manual name, using "": Nm */
        MANDOCERR_OS_UNAME, /* uname(3) system call failed, using UNKNOWN */
@@ -171,7 +172,6 @@ enum        mandocerr {
        MANDOCERR_FATAL, /* ===== start of fatal errors ===== */
 
        MANDOCERR_TOOLARGE, /* input too large */
-       MANDOCERR_BD_FILE, /* NOT IMPLEMENTED: Bd -file */
        MANDOCERR_SO_PATH, /* NOT IMPLEMENTED: .so with absolute path or ".." */
        MANDOCERR_SO_FAIL, /* .so request failed */
 

diff --git a/mdoc_validate.c b/mdoc_validate.c
index 5707b319ef3134ca9da35b01b9f4387a501bd6a2..f92fb6750ef18cff1534516531b6c893437a3f5c 100644 (file)
--- a/mdoc_validate.c
+++ b/mdoc_validate.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_validate.c,v 1.257 2014/11/27 16:20:31 schwarze Exp $ */
+/*     $Id: mdoc_validate.c,v 1.258 2014/11/27 23:40:19 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -761,7 +761,7 @@ pre_bd(PRE_ARGS)
                case MDOC_File:
                        mandoc_msg(MANDOCERR_BD_FILE, mdoc->parse,
                            n->line, n->pos, NULL);
-                       return(0);
+                       break;
                case MDOC_Offset:
                        if (0 == argv->sz) {
                                mandoc_msg(MANDOCERR_ARG_EMPTY,

diff --git a/read.c b/read.c
index 6ef75e51f003bd1f8483fa935bceb6ecea660b68..b71306b2bfd346d574dbd11b4b71abbbddbd5ad9 100644 (file)
--- a/read.c
+++ b/read.c
@@ -1,4 +1,4 @@
-/*     $Id: read.c,v 1.98 2014/11/26 23:42:14 schwarze Exp $ */
+/*     $Id: read.c,v 1.99 2014/11/27 23:40:19 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -202,6 +202,7 @@ static      const char * const      mandocerrs[MANDOCERR_MAX] = {
        /* related to request and macro arguments */
        "escaped character not allowed in a name",
        "argument count wrong",
+       "NOT IMPLEMENTED: Bd -file",
        "missing list type, using -item",
        "missing manual name, using \"\"",
        "uname(3) system call failed, using UNKNOWN",
@@ -214,7 +215,6 @@ static      const char * const      mandocerrs[MANDOCERR_MAX] = {
        "generic fatal error",
 
        "input too large",
-       "NOT IMPLEMENTED: Bd -file",
        "NOT IMPLEMENTED: .so with absolute path or \"..\"",
        ".so request failed",