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

Fix bug#1086, don't parse non-branch instructions inside a !if 0 block

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6418 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2013-12-08 16:24:06 +00:00
parent c16bc083b5
commit 527cf2d7a4
4 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Source/script.cpp
View file

@ -365,7 +365,7 @@ int CEXEBuild::doParse(const TCHAR *str)
{
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_valid_token(line.gettoken_str(0))))
if (ignore_line && (first_char!=_T('!') || !is_ppbranch_token(line.gettoken_str(0))))
{
m_linebuild.resize(0);
return PS_OK;