external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues Releases Wiki Activity

Fix crash on unsetting .sh.match

Browse source 
ksh crashed after unsetting .sh.match and then matching a pattern:

$ unset .sh.match
$ [[ bar == ba* ]]
Memory fault

src/cmd/ksh93/sh/init.c: sh_setmatch():
- Do nothing if we cannot get an array pointer to SH_MATCHNOD.
This commit is contained in:
Martijn Dekker 2021-11-15 03:18:18 +01:00
parent 31fe1c2890
commit a4375f3090
2 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
NEWS
View file

@ -5,6 +5,8 @@ Any uppercase BUG_* names are modernish shell bug IDs.
2021-11-14: 2021-11-14:
- Fixed: ksh crashed after unsetting .sh.match and then matching a pattern.
- Another test/[ fix: "test \( string1 -a string2 \)" and "test \( string1 -o - Another test/[ fix: "test \( string1 -a string2 \)" and "test \( string1 -o
string2 \)" no longer give an incorrect "argument expected" error message. string2 \)" no longer give an incorrect "argument expected" error message.

3
src/cmd/ksh93/sh/init.c
View file

@ -783,6 +783,9 @@ void sh_setmatch(Shell_t *shp,const char *v, int vsize, int nmatch, regoff_t mat
unsigned int savesub = shp->subshell; unsigned int savesub = shp->subshell;
Namarr_t *ap = nv_arrayptr(SH_MATCHNOD); Namarr_t *ap = nv_arrayptr(SH_MATCHNOD);
Namarr_t *ap_save = ap; Namarr_t *ap_save = ap;
/* do not crash if .sh.match is unset */
if(!ap)
return;
shp->subshell = 0; shp->subshell = 0;
#if !SHOPT_2DMATCH #if !SHOPT_2DMATCH
index = 0; index = 0;