Protect against malicious manual pages containing .ll requests with

[mandoc.git] / man_macro.c

diff --git a/man_macro.c b/man_macro.c
index 3b6fce812ad7e099d3e4b045a17c66977621ec59..aa8b200196a6eb36e24aecaae246b7634188b20d 100644 (file)
--- a/man_macro.c
+++ b/man_macro.c
@@ -1,4 +1,4 @@
-/*     $Id: man_macro.c,v 1.121 2017/06/13 19:34:40 schwarze Exp $ */
+/*     $Id: man_macro.c,v 1.123 2017/06/25 11:45:37 schwarze Exp $ */

 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2012-2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2012-2015, 2017 Ingo Schwarze <schwarze@openbsd.org>


@@ -69,12 +69,14 @@ const       struct man_macro __man_macros[MAN_MAX - MAN_TH] = {
        { in_line_eoln, 0 }, /* UC */
        { in_line_eoln, MAN_NSCOPED }, /* PD */
        { in_line_eoln, 0 }, /* AT */
        { in_line_eoln, 0 }, /* UC */
        { in_line_eoln, MAN_NSCOPED }, /* PD */
        { in_line_eoln, 0 }, /* AT */

-       { in_line_eoln, 0 }, /* in */
+       { in_line_eoln, MAN_NSCOPED }, /* in */

        { in_line_eoln, 0 }, /* OP */
        { in_line_eoln, MAN_BSCOPE }, /* EX */
        { in_line_eoln, MAN_BSCOPE }, /* EE */
        { blk_exp, MAN_BSCOPE }, /* UR */
        { blk_close, MAN_BSCOPE }, /* UE */
        { in_line_eoln, 0 }, /* OP */
        { in_line_eoln, MAN_BSCOPE }, /* EX */
        { in_line_eoln, MAN_BSCOPE }, /* EE */
        { blk_exp, MAN_BSCOPE }, /* UR */
        { blk_close, MAN_BSCOPE }, /* UE */

+       { blk_exp, MAN_BSCOPE }, /* MT */
+       { blk_close, MAN_BSCOPE }, /* ME */

 };
 const  struct man_macro *const man_macros = __man_macros - MAN_TH;
 
 };
 const  struct man_macro *const man_macros = __man_macros - MAN_TH;
 


@@ -217,6 +219,9 @@ blk_close(MACRO_PROT_ARGS)
        case MAN_UE:
                ntok = MAN_UR;
                break;
        case MAN_UE:
                ntok = MAN_UR;
                break;

+       case MAN_ME:
+               ntok = MAN_MT;
+               break;

        default:
                abort();
        }
        default:
                abort();
        }