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

Fixed !unmacrodef...again

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6522 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2014-07-16 18:10:28 +00:00
parent a560e2411c
commit f0e367d00d
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Source/script.cpp
View file

@ -944,7 +944,7 @@ TCHAR* CEXEBuild::GetMacro(const TCHAR *macroname, TCHAR**macroend /*= 0*/)
if (foundit) if (foundit)
{ {
if (macroend) *macroend = t; if (macroend) *macroend = ++t;
return mbeg; return mbeg;
} }
@ -1207,9 +1207,9 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
return PS_ERROR; return PS_ERROR;
} }
TCHAR *mbufb=(TCHAR*)m_macros.get(); TCHAR *mbufb=(TCHAR*)m_macros.get();
const unsigned int mcb=BUGBUG64TRUNCATE(unsigned int, (mend-mbeg)*sizeof(TCHAR)), mbufcb=m_macros.getlen(); const size_t mcb=((mend)-mbeg)*sizeof(TCHAR), mbufcb=m_macros.getlen();
memmove(mbeg,mend+1,mbufcb-(mcb+(mbeg-mbufb))); memmove(mbeg,mend,mbufcb-(((mbeg-mbufb)*sizeof(TCHAR))+mcb));
m_macros.resize((int)(mbufcb-(mcb+sizeof(TCHAR)))); m_macros.resize(BUGBUG64TRUNCATE(int,mbufcb-mcb));
SCRIPT_MSG(_T("!macroundef: %") NPRIs _T("\n"),mname); SCRIPT_MSG(_T("!macroundef: %") NPRIs _T("\n"),mname);
} }
return PS_OK; return PS_OK;