summaryrefslogtreecommitdiffstats
path: root/roff.c
diff options
context:
space:
mode:
authorKristaps Dzonsons <kristaps@bsd.lv>2011-04-13 16:26:11 +0000
committerKristaps Dzonsons <kristaps@bsd.lv>2011-04-13 16:26:11 +0000
commit280ceba1f875f9d2cb81c99074b648c556cdef7c (patch)
treecc9bf7430d57e171645d36362f41494339160077 /roff.c
parent02380eb0ac3df2e04b8fbd125b5038f12fcc656c (diff)
downloadmandoc-280ceba1f875f9d2cb81c99074b648c556cdef7c.tar.gz
Check in fix to roff conditional if/else stack running out of space.
This transforms the stack pop to occur prior to body execution, instead of afterward. Floated to tech@ without response, but it makes sense that this is alright and doesn't cause problems during extensive testing.
Diffstat (limited to 'roff.c')
-rw-r--r--roff.c57
1 files changed, 24 insertions, 33 deletions
diff --git a/roff.c b/roff.c
index 4789f7c8..c86bb31a 100644
--- a/roff.c
+++ b/roff.c
@@ -277,10 +277,6 @@ roffnode_pop(struct roff *r)
assert(r->last);
p = r->last;
- if (ROFF_el == p->tok)
- if (r->rstackpos > -1)
- r->rstackpos--;
-
r->last = r->last->parent;
free(p->name);
free(p->end);
@@ -976,29 +972,20 @@ roff_cond(ROFF_ARGS)
int sv;
enum roffrule rule;
- /* Stack overflow! */
-
- if (ROFF_ie == tok && r->rstackpos == RSTACK_MAX - 1) {
- mandoc_msg(MANDOCERR_MEM, r->parse, ln, ppos, NULL);
- return(ROFF_ERR);
- }
-
- /* First, evaluate the conditional. */
+ /*
+ * An `.el' has no conditional body: it will consume the value
+ * of the current rstack entry set in prior `ie' calls or
+ * defaults to DENY.
+ *
+ * If we're not an `el', however, then evaluate the conditional.
+ */
- if (ROFF_el == tok) {
- /*
- * An `.el' will get the value of the current rstack
- * entry set in prior `ie' calls or defaults to DENY.
- */
- if (r->rstackpos < 0)
- rule = ROFFRULE_DENY;
- else
- rule = r->rstack[r->rstackpos];
- } else
- rule = roff_evalcond(*bufp, &pos);
+ rule = ROFF_el == tok ?
+ (r->rstackpos < 0 ?
+ ROFFRULE_DENY : r->rstack[r->rstackpos--]) :
+ roff_evalcond(*bufp, &pos);
sv = pos;
-
while (' ' == (*bufp)[pos])
pos++;
@@ -1018,16 +1005,20 @@ roff_cond(ROFF_ARGS)
r->last->rule = rule;
+ /*
+ * An if-else will put the NEGATION of the current evaluated
+ * conditional into the stack of rules.
+ */
+
if (ROFF_ie == tok) {
- /*
- * An if-else will put the NEGATION of the current
- * evaluated conditional into the stack.
- */
- r->rstackpos++;
- if (ROFFRULE_DENY == r->last->rule)
- r->rstack[r->rstackpos] = ROFFRULE_ALLOW;
- else
- r->rstack[r->rstackpos] = ROFFRULE_DENY;
+ if (r->rstackpos == RSTACK_MAX - 1) {
+ mandoc_msg(MANDOCERR_MEM,
+ r->parse, ln, ppos, NULL);
+ return(ROFF_ERR);
+ }
+ r->rstack[++r->rstackpos] =
+ ROFFRULE_DENY == r->last->rule ?
+ ROFFRULE_ALLOW : ROFFRULE_DENY;
}
/* If the parent has false as its rule, then so do we. */