From: Tobias Brunner <tobias@strongswan.org>
Date: Thu, 19 Mar 2015 17:34:02 +0000 (+0100)
Subject: settings: Merge quoted strings that span multiple lines
X-Git-Tag: 5.3.0rc1~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d148c7ab6c127aad82ae1063da7f599860729734;p=thirdparty%2Fstrongswan.git

settings: Merge quoted strings that span multiple lines
---

diff --git a/src/libstrongswan/settings/settings_lexer.l b/src/libstrongswan/settings/settings_lexer.l
index c6546f4643..176387f1f4 100644
--- a/src/libstrongswan/settings/settings_lexer.l
+++ b/src/libstrongswan/settings/settings_lexer.l
@@ -148,9 +148,8 @@ static void include_files(parser_helper_t *ctx);
 	\\t     yyextra->string_add(yyextra, "\t");
 	\\b     yyextra->string_add(yyextra, "\b");
 	\\f     yyextra->string_add(yyextra, "\f");
-	\\(.|\n)			{
-		yyextra->string_add(yyextra, yytext+1);
-	}
+	\\\r?\n /* merge lines that end with EOL characters */
+	\\.     yyextra->string_add(yyextra, yytext+1);
 	[^\\\n"]+			{
 		yyextra->string_add(yyextra, yytext);
 	}