Reduce memory and time consumption on certain malformed input files

[mandoc.git] / term.c

diff --git a/term.c b/term.c
index dc30cca5b1041fd09846c66e25f4a923cd8fbc20..e6e3f641b7a5393b7ac08a5890658e9fbeef744f 100644 (file)
--- a/term.c
+++ b/term.c
@@ -1,4 +1,4 @@
-/*     $Id: term.c,v 1.234 2014/11/01 04:03:49 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>
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>


@@ -43,6 +43,7 @@ term_free(struct termp *p)
 {
 
        free(p->buf);
 {
 
        free(p->buf);

+       free(p->fontq);

        free(p);
 }
 
        free(p);
 }
 


@@ -100,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           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           mmax; /* used in calculating bp */

 
        /*
         * First, establish the maximum columns of "visible" content.
 
        /*
         * First, establish the maximum columns of "visible" content.


@@ -113,13 +113,16 @@ term_flushln(struct termp *p)
         * is negative, it gets sign extended.  Subtracting that
         * very large size_t effectively adds a small number to dv.
         */
         * is negative, it gets sign extended.  Subtracting that
         * very large size_t effectively adds a small number to dv.
         */

-       assert  (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;
        maxvis = (int)dv > p->overstep ? dv - (size_t)p->overstep : 0;

-       dv     = p->maxrmargin - p->offset;
-       mmax   = (int)dv > p->overstep ? dv - (size_t)p->overstep : 0;

 
 

-       bp = TERMP_NOBREAK & p->flags ? mmax : maxvis;
+       if (p->flags & TERMP_NOBREAK) {
+               dv = p->maxrmargin > p->offset ?
+                    p->maxrmargin - p->offset : 0;
+               bp = (int)dv > p->overstep ?
+                    dv - (size_t)p->overstep : 0;
+       } else
+               bp = maxvis;

 
        /*
         * Calculate the required amount of padding.
 
        /*
         * Calculate the required amount of padding.


@@ -189,7 +192,8 @@ term_flushln(struct termp *p)
                        p->viscol = 0;
                        if (TERMP_BRIND & p->flags) {
                                vbl = p->rmargin;
                        p->viscol = 0;
                        if (TERMP_BRIND & p->flags) {
                                vbl = p->rmargin;

-                               vend += p->rmargin - p->offset;
+                               vend += p->rmargin;
+                               vend -= p->offset;

                        } else
                                vbl = p->offset;
 
                        } else
                                vbl = p->offset;
 


@@ -254,8 +258,10 @@ term_flushln(struct termp *p)
         * If there was trailing white space, it was not printed;
         * so reset the cursor position accordingly.
         */
         * If there was trailing white space, it was not printed;
         * so reset the cursor position accordingly.
         */

-       if (vis)
+       if (vis > vbl)

                vis -= vbl;
                vis -= vbl;

+       else
+               vis = 0;

 
        p->col = 0;
        p->overstep = 0;
 
        p->col = 0;
        p->overstep = 0;


@@ -267,7 +273,7 @@ term_flushln(struct termp *p)
        }
 
        if (TERMP_HANG & p->flags) {
        }
 
        if (TERMP_HANG & p->flags) {

-               p->overstep = (int)(vis - maxvis +
+               p->overstep += (int)(p->offset + vis - p->rmargin +

                    p->trailspace * (*p->width)(p, ' '));
 
                /*
                    p->trailspace * (*p->width)(p, ' '));
 
                /*


@@ -323,6 +329,7 @@ term_vspace(struct termp *p)
                (*p->endline)(p);
 }
 
                (*p->endline)(p);
 }
 

+/* Swap current and previous font; for \fP and .ft P */

 void
 term_fontlast(struct termp *p)
 {
 void
 term_fontlast(struct termp *p)
 {


@@ -333,6 +340,7 @@ term_fontlast(struct termp *p)
        p->fontq[p->fonti] = f;
 }
 
        p->fontq[p->fonti] = f;
 }
 

+/* Set font, save current, discard previous; for \f, .ft, .B etc. */

 void
 term_fontrepl(struct termp *p, enum termfont f)
 {
 void
 term_fontrepl(struct termp *p, enum termfont f)
 {


@@ -341,38 +349,39 @@ term_fontrepl(struct termp *p, enum termfont f)
        p->fontq[p->fonti] = f;
 }
 
        p->fontq[p->fonti] = f;
 }
 

+/* Set font, save previous. */

 void
 term_fontpush(struct termp *p, enum termfont f)
 {
 
 void
 term_fontpush(struct termp *p, enum termfont f)
 {
 

-       assert(p->fonti + 1 < 10);

        p->fontl = p->fontq[p->fonti];
        p->fontl = p->fontq[p->fonti];

-       p->fontq[++p->fonti] = f;
+       if (++p->fonti == p->fontsz) {
+               p->fontsz += 8;
+               p->fontq = mandoc_reallocarray(p->fontq,
+                   p->fontsz, sizeof(enum termfont *));
+       }
+       p->fontq[p->fonti] = f;

 }
 
 }
 

-const void *
+/* Retrieve pointer to current font. */
+const enum termfont *

 term_fontq(struct termp *p)
 {
 
        return(&p->fontq[p->fonti]);
 }
 
 term_fontq(struct termp *p)
 {
 
        return(&p->fontq[p->fonti]);
 }
 

-enum termfont
-term_fonttop(struct termp *p)
-{
-
-       return(p->fontq[p->fonti]);
-}
-
+/* Flush to make the saved pointer current again. */

 void
 void

-term_fontpopq(struct termp *p, const void *key)
+term_fontpopq(struct termp *p, const enum termfont *key)

 {
 
 {
 

-       while (p->fonti >= 0 && key < (void *)(p->fontq + p->fonti))
+       while (p->fonti >= 0 && key < p->fontq + p->fonti)

                p->fonti--;
        assert(p->fonti >= 0);
 }
 
                p->fonti--;
        assert(p->fonti >= 0);
 }
 

+/* Pop one font off the stack. */

 void
 term_fontpop(struct termp *p)
 {
 void
 term_fontpop(struct termp *p)
 {


@@ -411,7 +420,7 @@ term_word(struct termp *p, const char *word)
        else
                p->flags |= TERMP_NOSPACE;
 
        else
                p->flags |= TERMP_NOSPACE;
 

-       p->flags &= ~TERMP_SENTENCE;
+       p->flags &= ~(TERMP_SENTENCE | TERMP_NONEWLINE);

 
        while ('\0' != *word) {
                if ('\\' != *word) {
 
        while ('\0' != *word) {
                if ('\\' != *word) {


@@ -481,7 +490,7 @@ term_word(struct termp *p, const char *word)
                        if (TERMP_SKIPCHAR & p->flags)
                                p->flags &= ~TERMP_SKIPCHAR;
                        else if ('\0' == *word)
                        if (TERMP_SKIPCHAR & p->flags)
                                p->flags &= ~TERMP_SKIPCHAR;
                        else if ('\0' == *word)

-                               p->flags |= TERMP_NOSPACE;
+                               p->flags |= (TERMP_NOSPACE | TERMP_NONEWLINE);

                        continue;
                case ESCAPE_SKIPCHAR:
                        p->flags |= TERMP_SKIPCHAR;
                        continue;
                case ESCAPE_SKIPCHAR:
                        p->flags |= TERMP_SKIPCHAR;


@@ -548,7 +557,7 @@ encode1(struct termp *p, int c)
        if (p->col + 6 >= p->maxcols)
                adjbuf(p, p->col + 6);
 
        if (p->col + 6 >= p->maxcols)
                adjbuf(p, p->col + 6);
 

-       f = term_fonttop(p);
+       f = *term_fontq(p);

 
        if (TERMFONT_UNDER == f || TERMFONT_BI == f) {
                p->buf[p->col++] = '_';
 
        if (TERMFONT_UNDER == f || TERMFONT_BI == f) {
                p->buf[p->col++] = '_';


@@ -580,7 +589,7 @@ encode(struct termp *p, const char *word, size_t sz)
         * character by character.
         */
 
         * character by character.
         */
 

-       if (TERMFONT_NONE == term_fonttop(p)) {
+       if (*term_fontq(p) == TERMFONT_NONE) {

                if (p->col + sz >= p->maxcols)
                        adjbuf(p, p->col + sz);
                for (i = 0; i < sz; i++)
                if (p->col + sz >= p->maxcols)
                        adjbuf(p, p->col + sz);
                for (i = 0; i < sz; i++)


@@ -760,47 +769,55 @@ term_strlen(const struct termp *p, const char *cp)
        return(sz);
 }
 
        return(sz);
 }
 

-size_t
+int

 term_vspan(const struct termp *p, const struct roffsu *su)
 {
        double           r;
 term_vspan(const struct termp *p, const struct roffsu *su)
 {
        double           r;

+       int              ri;

 
        switch (su->unit) {
 
        switch (su->unit) {

+       case SCALE_BU:
+               r = su->scale / 40.0;
+               break;

        case SCALE_CM:
        case SCALE_CM:

-               r = su->scale * 2.0;
+               r = su->scale * 6.0 / 2.54;
+               break;
+       case SCALE_FS:
+               r = su->scale * 65536.0 / 40.0;

                break;
        case SCALE_IN:
                r = su->scale * 6.0;
                break;
                break;
        case SCALE_IN:
                r = su->scale * 6.0;
                break;

+       case SCALE_MM:
+               r = su->scale * 0.006;
+               break;

        case SCALE_PC:
                r = su->scale;
                break;
        case SCALE_PT:
        case SCALE_PC:
                r = su->scale;
                break;
        case SCALE_PT:

-               r = su->scale / 8.0;
+               r = su->scale / 12.0;

                break;
                break;

-       case SCALE_MM:
-               r = su->scale / 1000.0;
+       case SCALE_EN:
+               /* FALLTHROUGH */
+       case SCALE_EM:
+               r = su->scale * 0.6;

                break;
        case SCALE_VS:
                r = su->scale;
                break;
        default:
                break;
        case SCALE_VS:
                r = su->scale;
                break;
        default:

-               r = su->scale - 1.0;
-               break;
+               abort();
+               /* NOTREACHED */

        }
        }

-
-       if (r < 0.0)
-               r = 0.0;
-       return((size_t)(r + 0.0005));
+       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);
 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);

 }
 }