Do not read past the end of the buffer if an "f" layout font modifier

[mandoc.git] / mdoc.h

diff --git a/mdoc.h b/mdoc.h
index 58ad81318f5e06037dfcf20f540249fed219370a..4db755b828f0a5b4a6942152aa8905a147d6ed38 100644 (file)
--- a/mdoc.h
+++ b/mdoc.h
@@ -1,4 +1,4 @@
-/*     $Id: mdoc.h,v 1.131 2014/07/29 13:58:18 schwarze Exp $ */
+/*     $Id: mdoc.h,v 1.135 2015/02/05 00:14:13 schwarze Exp $ */

 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *


@@ -14,8 +14,6 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */

-#ifndef MDOC_H
-#define MDOC_H

 
 enum   mdoct {
        MDOC_Ap = 0,
 
 enum   mdoct {
        MDOC_Ap = 0,


@@ -354,10 +352,10 @@ struct    mdoc_node {
        int               nchild; /* number children */
        int               line; /* parse line */
        int               pos; /* parse column */
        int               nchild; /* number children */
        int               line; /* parse line */
        int               pos; /* parse column */

-       int               lastline; /* the node ends on this line */

        enum mdoct        tok; /* tok or MDOC__MAX if none */
        int               flags;
 #define        MDOC_VALID       (1 << 0) /* has been validated */
        enum mdoct        tok; /* tok or MDOC__MAX if none */
        int               flags;
 #define        MDOC_VALID       (1 << 0) /* has been validated */

+#define        MDOC_BREAK       (1 << 1) /* has broken another block */

 #define        MDOC_EOS         (1 << 2) /* at sentence boundary */
 #define        MDOC_LINE        (1 << 3) /* first macro/text on line */
 #define        MDOC_SYNPRETTY   (1 << 4) /* SYNOPSIS-style formatting */
 #define        MDOC_EOS         (1 << 2) /* at sentence boundary */
 #define        MDOC_LINE        (1 << 3) /* first macro/text on line */
 #define        MDOC_SYNPRETTY   (1 << 4) /* SYNOPSIS-style formatting */


@@ -367,7 +365,7 @@ struct      mdoc_node {
        enum mdoc_type    type; /* AST node type */
        enum mdoc_sec     sec; /* current named section */
        union mdoc_data  *norm; /* normalised args */
        enum mdoc_type    type; /* AST node type */
        enum mdoc_sec     sec; /* current named section */
        union mdoc_data  *norm; /* normalised args */

-       const void       *prev_font; /* before entering this node */
+       int               prev_font; /* before entering this node */

        /* FIXME: these can be union'd to shave a few bytes. */
        struct mdoc_arg  *args; /* BLOCK/ELEM */
        struct mdoc_node *pending; /* BLOCK */
        /* FIXME: these can be union'd to shave a few bytes. */
        struct mdoc_arg  *args; /* BLOCK/ELEM */
        struct mdoc_node *pending; /* BLOCK */


@@ -395,5 +393,3 @@ const struct mdoc_meta *mdoc_meta(const struct mdoc *);
 void mdoc_deroff(char **, const struct mdoc_node *);
 
 __END_DECLS
 void mdoc_deroff(char **, const struct mdoc_node *);
 
 __END_DECLS

-
-#endif /*!MDOC_H*/