From 896872bf9d79f7b25e5881b533b74e7930ec1b14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Gonz=C3=A1lez?= <cgonzalez@opennebula.systems>
Date: Mon, 22 Oct 2018 17:38:05 +0200
Subject: [PATCH] F #2456 Escape "$" at VM templates (#2529)

(cherry picked from commit 9182eee7706aeb705d3c729ce5c296538701cf91)
---
 src/parsers/vm_var_parser.l | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/parsers/vm_var_parser.l b/src/parsers/vm_var_parser.l
index c70a15eece..b683a1784d 100644
--- a/src/parsers/vm_var_parser.l
+++ b/src/parsers/vm_var_parser.l
@@ -46,6 +46,12 @@
 %x VALUE
 %%
 
+ /* ------------------------------------------------------------------------- */
+ /* Just copy the string verbatim till we find a variable (starts with $)     */
+ /* ------------------------------------------------------------------------- */
+
+([^\$\\]|"\\\$"|\\[^\$])+  { yylval_param->val_str = mem_collector_strdup(mc,yytext); return RSTRING;}
+
  /* ------------------------------------------------------------------------- */
  /* Parse variables in the form:                                              */
  /*   $VARIABLE                                                               */
@@ -86,13 +92,6 @@
 <VAR><<EOF>>                   { yylval_param->val_char = '\0';
                                  BEGIN(INITIAL);
                                  return EOA;}
-
- /* ------------------------------------------------------------------------- */
- /* Just copy the string verbatim till we find a variable (starts with $)     */
- /* ------------------------------------------------------------------------- */
-
-[^\$]+  { yylval_param->val_str = mem_collector_strdup(mc,yytext); return RSTRING;}
-
 %%
 
 int vm_var_wrap(yyscan_t scanner)