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

validate $EXEPATH as well

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5107 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2007-04-19 21:47:12 +00:00
parent c3e4937efe
commit 72c2e4c211
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Source/build.cpp
View file

@ -301,10 +301,10 @@ CEXEBuild::CEXEBuild() :
m_UserVarNames.add("LANGUAGE",1); // 24 m_UserVarNames.add("LANGUAGE",1); // 24
m_UserVarNames.add("TEMP",-1); // 25 m_UserVarNames.add("TEMP",-1); // 25
m_UserVarNames.add("PLUGINSDIR",-1); // 26 m_UserVarNames.add("PLUGINSDIR",-1); // 26
m_UserVarNames.add("HWNDPARENT",-1); // 27 m_UserVarNames.add("EXEPATH",-1); // 27
m_UserVarNames.add("_CLICK",-1); // 28 m_UserVarNames.add("HWNDPARENT",-1); // 28
m_UserVarNames.add("_OUTDIR",1); // 29 m_UserVarNames.add("_CLICK",-1); // 29
m_UserVarNames.add("EXEPATH",-1); // 30 m_UserVarNames.add("_OUTDIR",1); // 30
m_iBaseVarsNum = m_UserVarNames.getnum(); m_iBaseVarsNum = m_UserVarNames.getnum();

4
Source/exehead/state.h
View file

@ -27,8 +27,8 @@ extern NSIS_STRING g_usrvars[1];
#ifdef NSIS_CONFIG_PLUGIN_SUPPORT #ifdef NSIS_CONFIG_PLUGIN_SUPPORT
# define state_plugins_dir g_usrvars[26] # define state_plugins_dir g_usrvars[26]
#endif #endif
#define state_click_next g_usrvars[28] #define state_exe_path g_usrvars[27]
#define state_exe_path g_usrvars[30] #define state_click_next g_usrvars[29]
extern char g_caption[NSIS_MAX_STRLEN*2]; extern char g_caption[NSIS_MAX_STRLEN*2];
#ifdef NSIS_CONFIG_VISIBLE_SUPPORT #ifdef NSIS_CONFIG_VISIBLE_SUPPORT

6
Source/exehead/util.c
View file

@ -674,13 +674,13 @@ char * NSISCALL GetNSISString(char *outbuf, int strtab)
} }
else if (nVarIdx == NS_VAR_CODE) else if (nVarIdx == NS_VAR_CODE)
{ {
if (nData == 27) // HWNDPARENT if (nData == 28) // HWNDPARENT
myitoa(out, (unsigned int) g_hwnd); myitoa(out, (unsigned int) g_hwnd);
else else
mystrcpy(out, g_usrvars[nData]); mystrcpy(out, g_usrvars[nData]);
// validate the directory name // validate the directory name
if ((unsigned int)(nData - 21) < 6) { if ((unsigned int)(nData - 21) < 7) {
// validate paths for $INSTDIR, $OUTDIR, $EXEDIR, $LANGUAGE, $TEMP and $PLUGINSDIR // validate paths for $INSTDIR, $OUTDIR, $EXEDIR, $LANGUAGE, $TEMP, $PLUGINSDIR and $EXEPATH
// $LANGUAGE is just a number anyway... // $LANGUAGE is just a number anyway...
validate_filename(out); validate_filename(out);
} }