Previously, the #line parsing regex ended with ({WS}+[0-9]+)?. The {WS}
could match line-break characters. If the #line directive did not contain
the optional flags field at the end, this could cause any integer data on
the next line to be consumed as part of the #line directive parsing. This
could cause syntax errors (i.e. #line parsing consuming the leading 0
from a hex literal 0x1234, leaving x1234 to be parsed as cell data,
which is a syntax error), or invalid compilation results (i.e. simply
consuming literal 1234 as part of the #line processing, thus removing it
from the cell data).
Fix this by replacing {WS} with [ \t] so that it can't match line-breaks.
Convert all instances of {WS}, even though the other instances should be
irrelevant for any well-formed #line directive. This is done for
consistency and ultimate safety.
[Cherry picked from DTC commit a1ee6f068e1c8dbc62873645037a353d7852d5cc]
Reported-by: Ian Campbell <Ian.Campbell@citrix.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
		
	
			
		
			
				
	
	
		
			250 lines
		
	
	
	
		
			5.4 KiB
			
		
	
	
	
		
			Text
		
	
	
	
	
	
			
		
		
	
	
			250 lines
		
	
	
	
		
			5.4 KiB
			
		
	
	
	
		
			Text
		
	
	
	
	
	
/*
 | 
						|
 * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2005.
 | 
						|
 *
 | 
						|
 *
 | 
						|
 * This program is free software; you can redistribute it and/or
 | 
						|
 * modify it under the terms of the GNU General Public License as
 | 
						|
 * published by the Free Software Foundation; either version 2 of the
 | 
						|
 * License, or (at your option) any later version.
 | 
						|
 *
 | 
						|
 *  This program is distributed in the hope that it will be useful,
 | 
						|
 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
						|
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 | 
						|
 *  General Public License for more details.
 | 
						|
 *
 | 
						|
 *  You should have received a copy of the GNU General Public License
 | 
						|
 *  along with this program; if not, write to the Free Software
 | 
						|
 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
 | 
						|
 *                                                                   USA
 | 
						|
 */
 | 
						|
 | 
						|
%option noyywrap nounput noinput never-interactive
 | 
						|
 | 
						|
%x INCLUDE
 | 
						|
%x BYTESTRING
 | 
						|
%x PROPNODENAME
 | 
						|
%s V1
 | 
						|
 | 
						|
PROPNODECHAR	[a-zA-Z0-9,._+*#?@-]
 | 
						|
PATHCHAR	({PROPNODECHAR}|[/])
 | 
						|
LABEL		[a-zA-Z_][a-zA-Z0-9_]*
 | 
						|
STRING		\"([^\\"]|\\.)*\"
 | 
						|
CHAR_LITERAL	'([^']|\\')*'
 | 
						|
WS		[[:space:]]
 | 
						|
COMMENT		"/*"([^*]|\*+[^*/])*\*+"/"
 | 
						|
LINECOMMENT	"//".*\n
 | 
						|
 | 
						|
%{
 | 
						|
#include "dtc.h"
 | 
						|
#include "srcpos.h"
 | 
						|
#include "dtc-parser.tab.h"
 | 
						|
 | 
						|
YYLTYPE yylloc;
 | 
						|
 | 
						|
/* CAUTION: this will stop working if we ever use yyless() or yyunput() */
 | 
						|
#define	YY_USER_ACTION \
 | 
						|
	{ \
 | 
						|
		srcpos_update(&yylloc, yytext, yyleng); \
 | 
						|
	}
 | 
						|
 | 
						|
/*#define LEXDEBUG	1*/
 | 
						|
 | 
						|
#ifdef LEXDEBUG
 | 
						|
#define DPRINT(fmt, ...)	fprintf(stderr, fmt, ##__VA_ARGS__)
 | 
						|
#else
 | 
						|
#define DPRINT(fmt, ...)	do { } while (0)
 | 
						|
#endif
 | 
						|
 | 
						|
static int dts_version = 1;
 | 
						|
 | 
						|
#define BEGIN_DEFAULT()		DPRINT("<V1>\n"); \
 | 
						|
				BEGIN(V1); \
 | 
						|
 | 
						|
static void push_input_file(const char *filename);
 | 
						|
static int pop_input_file(void);
 | 
						|
%}
 | 
						|
 | 
						|
%%
 | 
						|
<*>"/include/"{WS}*{STRING} {
 | 
						|
			char *name = strchr(yytext, '\"') + 1;
 | 
						|
			yytext[yyleng-1] = '\0';
 | 
						|
			push_input_file(name);
 | 
						|
		}
 | 
						|
 | 
						|
<*>^"#"(line)?[ \t]+[0-9]+[ \t]+{STRING}([ \t]+[0-9]+)? {
 | 
						|
			char *line, *tmp, *fn;
 | 
						|
			/* skip text before line # */
 | 
						|
			line = yytext;
 | 
						|
			while (!isdigit(*line))
 | 
						|
				line++;
 | 
						|
			/* skip digits in line # */
 | 
						|
			tmp = line;
 | 
						|
			while (!isspace(*tmp))
 | 
						|
				tmp++;
 | 
						|
			/* "NULL"-terminate line # */
 | 
						|
			*tmp = '\0';
 | 
						|
			/* start of filename */
 | 
						|
			fn = strchr(tmp + 1, '"') + 1;
 | 
						|
			/* strip trailing " from filename */
 | 
						|
			tmp = strchr(fn, '"');
 | 
						|
			*tmp = 0;
 | 
						|
			/* -1 since #line is the number of the next line */
 | 
						|
			srcpos_set_line(xstrdup(fn), atoi(line) - 1);
 | 
						|
		}
 | 
						|
 | 
						|
<*><<EOF>>		{
 | 
						|
			if (!pop_input_file()) {
 | 
						|
				yyterminate();
 | 
						|
			}
 | 
						|
		}
 | 
						|
 | 
						|
<*>{STRING}	{
 | 
						|
			DPRINT("String: %s\n", yytext);
 | 
						|
			yylval.data = data_copy_escape_string(yytext+1,
 | 
						|
					yyleng-2);
 | 
						|
			return DT_STRING;
 | 
						|
		}
 | 
						|
 | 
						|
<*>"/dts-v1/"	{
 | 
						|
			DPRINT("Keyword: /dts-v1/\n");
 | 
						|
			dts_version = 1;
 | 
						|
			BEGIN_DEFAULT();
 | 
						|
			return DT_V1;
 | 
						|
		}
 | 
						|
 | 
						|
<*>"/memreserve/"	{
 | 
						|
			DPRINT("Keyword: /memreserve/\n");
 | 
						|
			BEGIN_DEFAULT();
 | 
						|
			return DT_MEMRESERVE;
 | 
						|
		}
 | 
						|
 | 
						|
<*>"/bits/"	{
 | 
						|
			DPRINT("Keyword: /bits/\n");
 | 
						|
			BEGIN_DEFAULT();
 | 
						|
			return DT_BITS;
 | 
						|
		}
 | 
						|
 | 
						|
<*>"/delete-property/"	{
 | 
						|
			DPRINT("Keyword: /delete-property/\n");
 | 
						|
			DPRINT("<PROPNODENAME>\n");
 | 
						|
			BEGIN(PROPNODENAME);
 | 
						|
			return DT_DEL_PROP;
 | 
						|
		}
 | 
						|
 | 
						|
<*>"/delete-node/"	{
 | 
						|
			DPRINT("Keyword: /delete-node/\n");
 | 
						|
			DPRINT("<PROPNODENAME>\n");
 | 
						|
			BEGIN(PROPNODENAME);
 | 
						|
			return DT_DEL_NODE;
 | 
						|
		}
 | 
						|
 | 
						|
<*>{LABEL}:	{
 | 
						|
			DPRINT("Label: %s\n", yytext);
 | 
						|
			yylval.labelref = xstrdup(yytext);
 | 
						|
			yylval.labelref[yyleng-1] = '\0';
 | 
						|
			return DT_LABEL;
 | 
						|
		}
 | 
						|
 | 
						|
<V1>([0-9]+|0[xX][0-9a-fA-F]+)(U|L|UL|LL|ULL)? {
 | 
						|
			yylval.literal = xstrdup(yytext);
 | 
						|
			DPRINT("Literal: '%s'\n", yylval.literal);
 | 
						|
			return DT_LITERAL;
 | 
						|
		}
 | 
						|
 | 
						|
<*>{CHAR_LITERAL}	{
 | 
						|
			yytext[yyleng-1] = '\0';
 | 
						|
			yylval.literal = xstrdup(yytext+1);
 | 
						|
			DPRINT("Character literal: %s\n", yylval.literal);
 | 
						|
			return DT_CHAR_LITERAL;
 | 
						|
		}
 | 
						|
 | 
						|
<*>\&{LABEL}	{	/* label reference */
 | 
						|
			DPRINT("Ref: %s\n", yytext+1);
 | 
						|
			yylval.labelref = xstrdup(yytext+1);
 | 
						|
			return DT_REF;
 | 
						|
		}
 | 
						|
 | 
						|
<*>"&{/"{PATHCHAR}+\}	{	/* new-style path reference */
 | 
						|
			yytext[yyleng-1] = '\0';
 | 
						|
			DPRINT("Ref: %s\n", yytext+2);
 | 
						|
			yylval.labelref = xstrdup(yytext+2);
 | 
						|
			return DT_REF;
 | 
						|
		}
 | 
						|
 | 
						|
<BYTESTRING>[0-9a-fA-F]{2} {
 | 
						|
			yylval.byte = strtol(yytext, NULL, 16);
 | 
						|
			DPRINT("Byte: %02x\n", (int)yylval.byte);
 | 
						|
			return DT_BYTE;
 | 
						|
		}
 | 
						|
 | 
						|
<BYTESTRING>"]"	{
 | 
						|
			DPRINT("/BYTESTRING\n");
 | 
						|
			BEGIN_DEFAULT();
 | 
						|
			return ']';
 | 
						|
		}
 | 
						|
 | 
						|
<PROPNODENAME>\\?{PROPNODECHAR}+ {
 | 
						|
			DPRINT("PropNodeName: %s\n", yytext);
 | 
						|
			yylval.propnodename = xstrdup((yytext[0] == '\\') ?
 | 
						|
							yytext + 1 : yytext);
 | 
						|
			BEGIN_DEFAULT();
 | 
						|
			return DT_PROPNODENAME;
 | 
						|
		}
 | 
						|
 | 
						|
"/incbin/"	{
 | 
						|
			DPRINT("Binary Include\n");
 | 
						|
			return DT_INCBIN;
 | 
						|
		}
 | 
						|
 | 
						|
<*>{WS}+	/* eat whitespace */
 | 
						|
<*>{COMMENT}+	/* eat C-style comments */
 | 
						|
<*>{LINECOMMENT}+ /* eat C++-style comments */
 | 
						|
 | 
						|
<*>"<<"		{ return DT_LSHIFT; };
 | 
						|
<*>">>"		{ return DT_RSHIFT; };
 | 
						|
<*>"<="		{ return DT_LE; };
 | 
						|
<*>">="		{ return DT_GE; };
 | 
						|
<*>"=="		{ return DT_EQ; };
 | 
						|
<*>"!="		{ return DT_NE; };
 | 
						|
<*>"&&"		{ return DT_AND; };
 | 
						|
<*>"||"		{ return DT_OR; };
 | 
						|
 | 
						|
<*>.		{
 | 
						|
			DPRINT("Char: %c (\\x%02x)\n", yytext[0],
 | 
						|
				(unsigned)yytext[0]);
 | 
						|
			if (yytext[0] == '[') {
 | 
						|
				DPRINT("<BYTESTRING>\n");
 | 
						|
				BEGIN(BYTESTRING);
 | 
						|
			}
 | 
						|
			if ((yytext[0] == '{')
 | 
						|
			    || (yytext[0] == ';')) {
 | 
						|
				DPRINT("<PROPNODENAME>\n");
 | 
						|
				BEGIN(PROPNODENAME);
 | 
						|
			}
 | 
						|
			return yytext[0];
 | 
						|
		}
 | 
						|
 | 
						|
%%
 | 
						|
 | 
						|
static void push_input_file(const char *filename)
 | 
						|
{
 | 
						|
	assert(filename);
 | 
						|
 | 
						|
	srcfile_push(filename);
 | 
						|
 | 
						|
	yyin = current_srcfile->f;
 | 
						|
 | 
						|
	yypush_buffer_state(yy_create_buffer(yyin, YY_BUF_SIZE));
 | 
						|
}
 | 
						|
 | 
						|
 | 
						|
static int pop_input_file(void)
 | 
						|
{
 | 
						|
	if (srcfile_pop() == 0)
 | 
						|
		return 0;
 | 
						|
 | 
						|
	yypop_buffer_state();
 | 
						|
	yyin = current_srcfile->f;
 | 
						|
 | 
						|
	return 1;
 | 
						|
}
 |