mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-10-28 17:10:59 +01:00
Code Releases Activity

40990: Fix crash with bogus path in sh emaulation.

Browse source 
When startying in sh emulation don't link PATH-style parameters
to array equivalents.  To allow this to function, don't check
for the linkage when exporting the colon-separated parameter.
This commit is contained in:
Peter Stephenson 2017-04-21 18:04:11 +01:00
parent 6cc6942cf5
commit a2e2f5668d
2 changed files with 43 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2017-04-21 Peter Stephenson <p.stephenson@samsung.com>
* 40990: Src/params.c: When starting in sh emulation, don't
link PATH-style parameters to array equivalents. Don't
check linkage when exporting colon-separated parameter.
2017-04-18 Daniel Shahaf <d.s@daniel.shahaf.name> 2017-04-18 Daniel Shahaf <d.s@daniel.shahaf.name>
* 40973: Completion/Unix/Type/_remote_files: Fix completion of * 40973: Completion/Unix/Type/_remote_files: Fix completion of

51
Src/params.c
View file

@ -361,6 +361,17 @@ IPDEF7("PS3", &prompt3),
IPDEF7R("PS4", &prompt4), IPDEF7R("PS4", &prompt4),
IPDEF7("SPROMPT", &sprompt), IPDEF7("SPROMPT", &sprompt),
#define IPDEF9F(A,B,C,D) {{NULL,A,D|PM_ARRAY|PM_SPECIAL|PM_DONTIMPORT},BR((void *)B),GSU(vararray_gsu),0,0,NULL,C,NULL,0}
#define IPDEF9(A,B,C) IPDEF9F(A,B,C,0)
IPDEF9F("*", &pparams, NULL, PM_ARRAY|PM_SPECIAL|PM_DONTIMPORT|PM_READONLY),
IPDEF9F("@", &pparams, NULL, PM_ARRAY|PM_SPECIAL|PM_DONTIMPORT|PM_READONLY),
/*
* This empty row indicates the end of parameters available in
* all emulations.
*/
{{NULL,NULL,0},BR(NULL),NULL_GSU,0,0,NULL,NULL,NULL,0},
#define IPDEF8(A,B,C,D) {{NULL,A,D|PM_SCALAR|PM_SPECIAL},BR((void *)B),GSU(colonarr_gsu),0,0,NULL,C,NULL,0} #define IPDEF8(A,B,C,D) {{NULL,A,D|PM_SCALAR|PM_SPECIAL},BR((void *)B),GSU(colonarr_gsu),0,0,NULL,C,NULL,0}
IPDEF8("CDPATH", &cdpath, "cdpath", 0), IPDEF8("CDPATH", &cdpath, "cdpath", 0),
IPDEF8("FIGNORE", &fignore, "fignore", 0), IPDEF8("FIGNORE", &fignore, "fignore", 0),
@ -374,17 +385,6 @@ IPDEF8("ZSH_EVAL_CONTEXT", &zsh_eval_context, "zsh_eval_context", PM_READONLY),
/* MODULE_PATH is not imported for security reasons */ /* MODULE_PATH is not imported for security reasons */
IPDEF8("MODULE_PATH", &module_path, "module_path", PM_DONTIMPORT|PM_RESTRICTED), IPDEF8("MODULE_PATH", &module_path, "module_path", PM_DONTIMPORT|PM_RESTRICTED),
#define IPDEF9F(A,B,C,D) {{NULL,A,D|PM_ARRAY|PM_SPECIAL|PM_DONTIMPORT},BR((void *)B),GSU(vararray_gsu),0,0,NULL,C,NULL,0}
#define IPDEF9(A,B,C) IPDEF9F(A,B,C,0)
IPDEF9F("*", &pparams, NULL, PM_ARRAY|PM_SPECIAL|PM_DONTIMPORT|PM_READONLY),
IPDEF9F("@", &pparams, NULL, PM_ARRAY|PM_SPECIAL|PM_DONTIMPORT|PM_READONLY),
/*
* This empty row indicates the end of parameters available in
* all emulations.
*/
{{NULL,NULL,0},BR(NULL),NULL_GSU,0,0,NULL,NULL,NULL,0},
#define IPDEF10(A,B) {{NULL,A,PM_ARRAY|PM_SPECIAL},BR(NULL),GSU(B),10,0,NULL,NULL,NULL,0} #define IPDEF10(A,B) {{NULL,A,PM_ARRAY|PM_SPECIAL},BR(NULL),GSU(B),10,0,NULL,NULL,NULL,0}
/* /*
@ -423,6 +423,26 @@ IPDEF10("pipestatus", pipestatus_gsu),
{{NULL,NULL,0},BR(NULL),NULL_GSU,0,0,NULL,NULL,NULL,0}, {{NULL,NULL,0},BR(NULL),NULL_GSU,0,0,NULL,NULL,NULL,0},
}; };
/*
* Alternative versions of colon-separated path parameters for
* sh emulation. These don't link to the array versions.
*/
static initparam special_params_sh[] = {
IPDEF8("CDPATH", &cdpath, NULL, 0),
IPDEF8("FIGNORE", &fignore, NULL, 0),
IPDEF8("FPATH", &fpath, NULL, 0),
IPDEF8("MAILPATH", &mailpath, NULL, 0),
IPDEF8("WATCH", &watch, NULL, 0),
IPDEF8("PATH", &path, NULL, PM_RESTRICTED),
IPDEF8("PSVAR", &psvar, NULL, 0),
IPDEF8("ZSH_EVAL_CONTEXT", &zsh_eval_context, NULL, PM_READONLY),
/* MODULE_PATH is not imported for security reasons */
IPDEF8("MODULE_PATH", &module_path, NULL, PM_DONTIMPORT|PM_RESTRICTED),
{{NULL,NULL,0},BR(NULL),NULL_GSU,0,0,NULL,NULL,NULL,0},
};
/* /*
* Special way of referring to the positional parameters. Unlike $* * Special way of referring to the positional parameters. Unlike $*
* and $@, this is not readonly. This parameter is not directly * and $@, this is not readonly. This parameter is not directly
@ -753,9 +773,13 @@ createparamtable(void)
/* Add the special parameters to the hash table */ /* Add the special parameters to the hash table */
for (ip = special_params; ip->node.nam; ip++) for (ip = special_params; ip->node.nam; ip++)
paramtab->addnode(paramtab, ztrdup(ip->node.nam), ip); paramtab->addnode(paramtab, ztrdup(ip->node.nam), ip);
if (!EMULATION(EMULATE_SH|EMULATE_KSH)) if (EMULATION(EMULATE_SH|EMULATE_KSH)) {
for (ip = special_params_sh; ip->node.nam; ip++)
paramtab->addnode(paramtab, ztrdup(ip->node.nam), ip);
} else {
while ((++ip)->node.nam) while ((++ip)->node.nam)
paramtab->addnode(paramtab, ztrdup(ip->node.nam), ip); paramtab->addnode(paramtab, ztrdup(ip->node.nam), ip);
}
argvparam = (Param) &argvparam_pm; argvparam = (Param) &argvparam_pm;
@ -3857,8 +3881,7 @@ colonarrsetfn(Param pm, char *x)
*dptr = colonsplit(x, pm->node.flags & PM_UNIQUE); *dptr = colonsplit(x, pm->node.flags & PM_UNIQUE);
else else
*dptr = mkarray(NULL); *dptr = mkarray(NULL);
if (pm->ename) arrfixenv(pm->node.nam, *dptr);
arrfixenv(pm->node.nam, *dptr);
zsfree(x); zsfree(x);
} }