dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Preprocessor code in dead blocks need to be ignored even if it is invalid

Browse source 
Test case:
!macro dummy p1
!macroend
!if 0 ; The next line does not properly quote its string but it is not !else nor !endif so it has to be ignored
!insertmacro dummy "bar'
!endif



git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6632 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2015-11-05 04:46:14 +00:00
parent 2a341bc918
commit ce249976f7
4 changed files with 26 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Source/script.cpp
View file

@ -364,11 +364,18 @@ int CEXEBuild::doParse(const TCHAR *str)
// if ignoring, ignore all lines that don't begin with an exclamation mark
{
bool ignore_line = cur_ifblock && (cur_ifblock->ignore || cur_ifblock->inherited_ignore);
TCHAR first_char = *(TCHAR *) m_linebuild.get();
if (ignore_line && (first_char!=_T('!') || !is_ppbranch_token(line.gettoken_str(0))))
if (ignore_line)
{
m_linebuild.resize(0);
return PS_OK;
TCHAR *rawline = (TCHAR*) m_linebuild.get(), first_char = *rawline, buf[30], *first_token = buf;
if (!res)
first_token = line.gettoken_str(0);
else // LineParser::parse() failed so we cannot call gettoken_str but we still might need to ignore this line
for (size_t i = 0; i < COUNTOF(buf); ++i) if ((buf[i] = rawline[i]) <= ' ') { buf[i] = _T('\0'); break; }
if (first_char!=_T('!') || !is_ppbranch_token(first_token))
{
m_linebuild.resize(0);
return PS_OK;
}
}
}