From 3e1afb637b565d639a6bad43012e60d5172e4086 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 2 Jun 2012 16:17:48 +0100 Subject: [PATCH] fix parsing bug --- debian/changelog | 7 ++++++- parser.c | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index faa29e4..fa52309 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,10 @@ -userv (1.0.7~~iwj) unstable; urgency=low +userv (1.1.0~~iwj) unstable; urgency=low + Bugfix: + * Do not reject comments and blank lines inside not-being-executed + conditional clauses. (Closes: #613862.) + + General improvements: * Introduce a use of socklen_t to avoid a compiler warning. * Remove spec.html and spec.ps from revision control. * Revision control switched from cvs to git. diff --git a/parser.c b/parser.c index e063bf9..037e6f9 100644 --- a/parser.c +++ b/parser.c @@ -422,7 +422,7 @@ static int skip(int allowce) { for (;;) { /* loop over lines */ cstate->reportlineno= cstate->lineno; - do { token= yylex(); } while (token == tokv_lwsp); + do { token= yylex(); } while (token == tokv_lwsp || token == tokv_newline); if (token & tokt_exception) { return token; } else if (token & tokt_controlend) { -- 2.30.2