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

Fix "!insertmacro foo /* this comment kills the macro body" parser bug

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6384 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2013-07-10 21:03:32 +00:00
parent 5ae11b00fa
commit 009318ef94
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Source/script.cpp
View file

@ -1044,7 +1044,7 @@ int CEXEBuild::process_oneline(TCHAR *line, const TCHAR *filename, int linenum)
TCHAR *oldtimestamp = NULL;
TCHAR *oldline = NULL;
bool is_commandline = !_tcscmp(filename,_T("<command line>"));
bool is_macro = !_tcsncmp(filename,_T("macro:"),_tcslen(_T("macro:")));
bool is_macro = !_tcsncmp(filename,_T("macro:"),6);
if(!is_commandline) { // Don't set the predefines for command line /X option
if(!is_macro) {
@ -1279,6 +1279,8 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
}
int npos=m_macro_entry.add(macroname,0);
const bool oldparserinsidecomment=inside_comment;
inside_comment=false; // "!insertmacro foo /*" does not mean that the macro body is a comment
wsprintf(str,_T("macro:%s"),macroname);
const TCHAR* oldmacroname=m_currentmacroname;
m_currentmacroname=macroname;
@ -1299,11 +1301,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
{
// fix t if process_oneline changed m_macros
TCHAR *nm=(TCHAR *)m_macros.get();
if (nm != m)
{
t += nm - m;
m = nm;
}
if (nm != m) t += nm - m, m = nm;
}
t+=_tcslen(t)+1;
}
@ -1319,7 +1317,8 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
}
}
definedlist.del(_T("__MACRO__"));
m_currentmacroname = oldmacroname;
m_currentmacroname=oldmacroname;
inside_comment=oldparserinsidecomment;
if (oldmacroname) definedlist.add(_T("__MACRO__"),oldmacroname);
SCRIPT_MSG(_T("!insertmacro: end of %s\n"),macroname);
}