Reduce memory and time consumption on certain malformed input files

[mandoc.git] / term.c

diff --git a/term.c b/term.c
index 8d05afc41225a54ed73f3b5361bbac10119aa159..e6e3f641b7a5393b7ac08a5890658e9fbeef744f 100644 (file)
--- a/term.c
+++ b/term.c
@@ -1,4 +1,4 @@
-/*     $Id: term.c,v 1.239 2014/12/23 06:16:46 schwarze Exp $ */
+/*     $Id: term.c,v 1.242 2014/12/24 23:32:42 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -101,7 +101,6 @@ term_flushln(struct termp *p)
        size_t           j;     /* temporary loop index for p->buf */
        size_t           jhy;   /* last hyph before overflow w/r/t j */
        size_t           maxvis; /* output position of visible boundary */
-       size_t           rmargin; /* the rightmost of the two margins */
 
        /*
         * First, establish the maximum columns of "visible" content.
@@ -114,8 +113,7 @@ term_flushln(struct termp *p)
         * is negative, it gets sign extended.  Subtracting that
         * very large size_t effectively adds a small number to dv.
         */
-       rmargin = p->rmargin > p->offset ? p->rmargin : p->offset;
-       dv = p->rmargin - p->offset;
+       dv = p->rmargin > p->offset ? p->rmargin - p->offset : 0;
        maxvis = (int)dv > p->overstep ? dv - (size_t)p->overstep : 0;
 
        if (p->flags & TERMP_NOBREAK) {
@@ -193,8 +191,9 @@ term_flushln(struct termp *p)
                        (*p->endline)(p);
                        p->viscol = 0;
                        if (TERMP_BRIND & p->flags) {
-                               vbl = rmargin;
-                               vend += rmargin - p->offset;
+                               vbl = p->rmargin;
+                               vend += p->rmargin;
+                               vend -= p->offset;
                        } else
                                vbl = p->offset;
 
@@ -274,7 +273,7 @@ term_flushln(struct termp *p)
        }
 
        if (TERMP_HANG & p->flags) {
-               p->overstep = (int)(vis - maxvis +
+               p->overstep += (int)(p->offset + vis - p->rmargin +
                    p->trailspace * (*p->width)(p, ' '));
 
                /*
@@ -770,10 +769,11 @@ term_strlen(const struct termp *p, const char *cp)
        return(sz);
 }
 
-size_t
+int
 term_vspan(const struct termp *p, const struct roffsu *su)
 {
        double           r;
+       int              ri;
 
        switch (su->unit) {
        case SCALE_BU:
@@ -809,19 +809,15 @@ term_vspan(const struct termp *p, const struct roffsu *su)
                abort();
                /* NOTREACHED */
        }
-
-       if (r < 0.0)
-               r = 0.0;
-       return((size_t)(r + 0.4995));
+       ri = r > 0.0 ? r + 0.4995 : r - 0.4995;
+       return(ri < 66 ? ri : 1);
 }
 
-size_t
+int
 term_hspan(const struct termp *p, const struct roffsu *su)
 {
        double           v;
 
        v = (*p->hspan)(p, su);
-       if (v < 0.0)
-               v = 0.0;
-       return((size_t)(v + 0.0005));
+       return(v > 0.0 ? v + 0.0005 : v - 0.0005);
 }