From: Francis Dupont <fdupont@isc.org>
Date: Sun, 27 Nov 2016 07:44:52 +0000 (+0100)
Subject: [5014_phase2] Fixed default rule (flex -s)
X-Git-Tag: trac5036_base2~14
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dd3c52d99c0d176197893ea8c00bb290c691475a;p=thirdparty%2Fkea.git

[5014_phase2] Fixed default rule (flex -s)
---

diff --git a/src/bin/dhcp6/dhcp6_lexer.ll b/src/bin/dhcp6/dhcp6_lexer.ll
index a26734868c..927d5e2f3b 100644
--- a/src/bin/dhcp6/dhcp6_lexer.ll
+++ b/src/bin/dhcp6/dhcp6_lexer.ll
@@ -148,15 +148,18 @@ JSONString                              \"{JSONStringCharacter}*\"
 
     driver.includeFile(tmp);
 }
+<DIR_ENTER,DIR_INCLUDE,DIR_EXIT><<EOF>> {
+    isc_throw(isc::BadValue, "Directive not closed.");
+}
 <DIR_EXIT>"?>" BEGIN(INITIAL);
     
 
-{blank}+   {
+<*>{blank}+   {
     // Ok, we found a with space. Let's ignore it and update loc variable.
     loc.step();
 }
 
-[\n]+      {
+<*>[\n]+      {
     // Newline found. Let's update the location and continue.
     loc.lines(yyleng);
     loc.step();
@@ -792,7 +795,7 @@ null {
    return isc::dhcp::Dhcp6Parser::make_NULL_TYPE(loc);
 }
 
-.   driver.error (loc, "Invalid character: " + std::string(yytext));
+<*>.   driver.error (loc, "Invalid character: " + std::string(yytext));
 
 <<EOF>> {
     if (states.empty()) {