Fixed bug #1122 StrCpy maxlen inconsistent behavior

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6810 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2016-12-05 15:44:19 +00:00
parent aaca82cd5f
commit 7f2ca3cdee
5 changed files with 57 additions and 77 deletions

View file

@ -3730,6 +3730,13 @@ int CEXEBuild::DeclaredUserVar(const TCHAR *szVarName)
}
int CEXEBuild::GetUnsafeUserVarIndex(LineParser &line, int token)
{
TCHAR *p = line.gettoken_str(token);
int idx = (*p == _T('$') && *++p) ? m_UserVarNames.get(p) : -1;
if (idx >= 0 && m_UserVarNames.get_reference(idx) >= 0) m_UserVarNames.inc_reference(idx);
return idx;
}
int CEXEBuild::GetUserVarIndex(LineParser &line, int token)
{
TCHAR *p = line.gettoken_str(token);