Re: [bug #27695] parser.sh ignores the closing quote when preceeded by a variable

[Robert Millan <rmh@aybabtu.com>]

On Thu, Oct 15, 2009 at 03:28:02PM +0200, Vladimir 'phcoder' Serbinenko wrote:
> diff --git a/script/sh/lexer.c b/script/sh/lexer.c
> index a30e3c0..0c71dae 100644
> --- a/script/sh/lexer.c
> +++ b/script/sh/lexer.c
> @@ -350,9 +350,11 @@ grub_script_yylex (union YYSTYPE *yylval, struct grub_parser_param *parsestate)
>  	      if (! (check_varstate (newstate)))
>  		{
>  		  if (state->state == GRUB_PARSER_STATE_VARNAME2
> -		  || state->state == GRUB_PARSER_STATE_QVARNAME2)
> -		    nextchar (state);
> -		  state->state = newstate;
> +		      || state->state == GRUB_PARSER_STATE_QVARNAME2)
> +		    {
> +		      nextchar (state);
> +		      state->state = newstate;
> +		    }
>  		  break;
>  		}
>  
> @@ -378,7 +380,6 @@ grub_script_yylex (union YYSTYPE *yylval, struct grub_parser_param *parsestate)
>  
>  	  buffer[bufpos++] = 0;
>  
> -	  state->state = newstate;
>  	  yylval->arg = grub_script_arg_add (parsestate, yylval->arg,
>  					     GRUB_SCRIPT_ARG_TYPE_VAR, buffer);
>  	  grub_dprintf ("scripting", "vartoken=`%s'\n", buffer);

Same here, I'm afraid.

-- 
Robert Millan

  The DRM opt-in fallacy: "Your data belongs to us. We will decide when (and
  how) you may access your data; but nobody's threatening your freedom: we
  still allow you to remove your data and not access it at all."