From 2dc79fdfe9f432c5455a488c58e19441a3e91ce7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Wed, 5 Mar 2014 15:40:45 +0100 Subject: [PATCH] feature #2465: Fix parsing of empty strings. --- src/template/template_parser.l | 2 +- src/template/template_syntax.y | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/template/template_parser.l b/src/template/template_parser.l index 73832f435c..128c54acfc 100644 --- a/src/template/template_parser.l +++ b/src/template/template_parser.l @@ -75,7 +75,7 @@ STRING [^=#[:blank:]\n,\[\]]+ /* - String in double quoted form */ /* - Anything but =,][# and blanks */ /* ------------------------------------------------------------------------ */ -\"([^\"]|"\\\"")+\" { lvalp->val_str = mem_collector_strdup(mc,yytext+1); +\"([^\"]|"\\\"")*\" { lvalp->val_str = mem_collector_strdup(mc,yytext+1); lvalp->val_str[yyleng-2] = '\0'; BEGIN(INITIAL); return STRING; } diff --git a/src/template/template_syntax.y b/src/template/template_syntax.y index 2d08f2ce1e..ca1d0bfaea 100644 --- a/src/template/template_syntax.y +++ b/src/template/template_syntax.y @@ -126,7 +126,7 @@ attribute: VARIABLE EQUAL STRING { Attribute * pattr; string name($1); - string value(""); + string value; pattr = new SingleAttribute(name,value);