From 68af4dca6a1390f9087264cfbd5cbf49bfc12963 Mon Sep 17 00:00:00 2001 From: Kristaps Dzonsons Date: Tue, 26 Jul 2011 14:09:01 +0000 Subject: Move checking of escapes into roff.c, where we're already stepping through looking for user-defined escapes. This clears up a nice bit of validation code. --- roff.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'roff.c') diff --git a/roff.c b/roff.c index b43211fb..439516fe 100644 --- a/roff.c +++ b/roff.c @@ -1,4 +1,4 @@ -/* $Id: roff.c,v 1.151 2011/07/25 15:37:00 kristaps Exp $ */ +/* $Id: roff.c,v 1.152 2011/07/26 14:09:01 kristaps Exp $ */ /* * Copyright (c) 2010, 2011 Kristaps Dzonsons * Copyright (c) 2010, 2011 Ingo Schwarze @@ -404,6 +404,7 @@ roff_alloc(struct mparse *parse) static int roff_res(struct roff *r, char **bufp, size_t *szp, int ln, int pos) { + enum mandoc_esc esc; const char *stesc; /* start of an escape sequence ('\\') */ const char *stnam; /* start of the name, after "[(*" */ const char *cp; /* end of the name, e.g. before ']' */ @@ -426,8 +427,19 @@ roff_res(struct roff *r, char **bufp, size_t *szp, int ln, int pos) if ('\0' == *cp) return(1); - if ('*' != *cp++) + + if ('*' != *cp) { + res = cp; + esc = mandoc_escape(&cp, NULL, NULL); + if (ESCAPE_ERROR != esc) + continue; + mandoc_msg(MANDOCERR_BADESCAPE, + r->parse, ln, pos, NULL); + cp = res; continue; + } + + cp++; /* * The third character decides the length -- cgit v1.2.3