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

Fixed !macroundef off by one error

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6512 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2014-07-05 00:04:06 +00:00
parent 0a8c72c950
commit 83cc78d77b
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Docs/src/history.but
View file

@ -24,6 +24,8 @@ Released on ?, 2014
\b Fixed POSIX !searchparse bug (\W{http://sf.net/p/nsis/patches/251}{patch #251}) \b Fixed POSIX !searchparse bug (\W{http://sf.net/p/nsis/patches/251}{patch #251})
\b Fixed !macroundef
\S2{} Translations \S2{} Translations
\b Added Armenian (Hrant Ohanyan) \b Added Armenian (Hrant Ohanyan)
@ -98,8 +100,6 @@ It's the holiday gift you've been waiting for!
\b Unicode stubs create WCHAR richedit controls (\W{http://sf.net/p/nsis/bugs/1080/}{bug #1080}) \b Unicode stubs create WCHAR richedit controls (\W{http://sf.net/p/nsis/bugs/1080/}{bug #1080})
\b Fixed !macroundef
\b Fixed MakeNSISW default pushbutton and tab order \b Fixed MakeNSISW default pushbutton and tab order
\b Fixed incorrect page count in compiler statistics \b Fixed incorrect page count in compiler statistics

2
Source/script.cpp
View file

@ -1212,7 +1212,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
} }
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 unsigned int mcb=BUGBUG64TRUNCATE(unsigned int, (mend-mbeg)*sizeof(TCHAR)), mbufcb=m_macros.getlen();
memmove(mbeg,mend+sizeof(TCHAR),mbufcb-(mcb+(mbeg-mbufb))); memmove(mbeg,mend+1,mbufcb-(mcb+(mbeg-mbufb)));
m_macros.resize((int)(mbufcb-(mcb+sizeof(TCHAR)))); m_macros.resize((int)(mbufcb-(mcb+sizeof(TCHAR))));
SCRIPT_MSG(_T("!macroundef: %") NPRIs _T("\n"),mname); SCRIPT_MSG(_T("!macroundef: %") NPRIs _T("\n"),mname);
} }