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 segfault while updating ${.sh.match}

Browse source 
The SHOPT_2DMATCH code block in sh_setmatch() modifies the 'ap'
pointer, which is initialised as nv_arrayptr(SH_MATCHNOD). This
caused a (rarely occurring) segfault in the following line near the
end of the function:
	ap->nelem -= x;
as this line assumed that 'ap' still had the initial value.

src/cmd/ksh93/sh/init.c: sh_setmatch():
- On init, save ap in ap_save and use ap_save instead of ap where
  it should be pointing to SH_MATCHNOD. This also allows removing
  two redundant nv_arrayptr(SH_MATCHNOD) calls, slightly increasing
  the efficiency of this function.
This commit is contained in:
Martijn Dekker 2021-01-07 17:34:47 +00:00
parent f2c84ee202
commit a95d107ee5
3 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
NEWS
View file

@ -3,6 +3,10 @@ For full details, see the git log at: https://github.com/ksh93/ksh
Any uppercase BUG_* names are modernish shell bug IDs. Any uppercase BUG_* names are modernish shell bug IDs.
2021-01-07:
- Fixed a crash that could occur while ksh updated ${.sh.match}.
2021-01-05: 2021-01-05:
- Fixed a bug in 'cd' that caused 'cd ./foo' to search for 'foo' in $CDPATH. - Fixed a bug in 'cd' that caused 'cd ./foo' to search for 'foo' in $CDPATH.

2
src/cmd/ksh93/include/version.h
View file

@ -20,7 +20,7 @@
#define SH_RELEASE_FORK "93u+m" /* only change if you develop a new ksh93 fork */ #define SH_RELEASE_FORK "93u+m" /* only change if you develop a new ksh93 fork */
#define SH_RELEASE_SVER "1.0.0-alpha" /* semantic version number: https://semver.org */ #define SH_RELEASE_SVER "1.0.0-alpha" /* semantic version number: https://semver.org */
#define SH_RELEASE_DATE "2021-01-05" /* must be in this format for $((.sh.version)) */ #define SH_RELEASE_DATE "2021-01-07" /* must be in this format for $((.sh.version)) */
/* Scripts sometimes field-split ${.sh.version}, so don't change amount of whitespace. */ /* Scripts sometimes field-split ${.sh.version}, so don't change amount of whitespace. */
/* Arithmetic $((.sh.version)) uses the last 10 chars, so the date must be at the end. */ /* Arithmetic $((.sh.version)) uses the last 10 chars, so the date must be at the end. */

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

@ -725,6 +725,7 @@ void sh_setmatch(Shell_t *shp,const char *v, int vsize, int nmatch, regoff_t mat
register int i,n,x; register int i,n,x;
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;
shp->subshell = 0; shp->subshell = 0;
#ifndef SHOPT_2DMATCH #ifndef SHOPT_2DMATCH
index = 0; index = 0;
@ -754,8 +755,7 @@ void sh_setmatch(Shell_t *shp,const char *v, int vsize, int nmatch, regoff_t mat
nv_disc(SH_MATCHNOD,&mp->hdr,NV_LAST); nv_disc(SH_MATCHNOD,&mp->hdr,NV_LAST);
if(nmatch) if(nmatch)
nv_putsub(SH_MATCHNOD, NIL(char*), (nmatch-1)|ARRAY_FILL|ARRAY_SETSUB); nv_putsub(SH_MATCHNOD, NIL(char*), (nmatch-1)|ARRAY_FILL|ARRAY_SETSUB);
ap = nv_arrayptr(SH_MATCHNOD); ap_save->nelem = mp->nmatch = nmatch;
ap->nelem = mp->nmatch = nmatch;
mp->v = v; mp->v = v;
mp->first = match[0]; mp->first = match[0];
} }
@ -773,8 +773,7 @@ void sh_setmatch(Shell_t *shp,const char *v, int vsize, int nmatch, regoff_t mat
nv_putsub(SH_MATCHNOD, (char*)0, i); nv_putsub(SH_MATCHNOD, (char*)0, i);
nv_arraychild(SH_MATCHNOD, np,0); nv_arraychild(SH_MATCHNOD, np,0);
} }
if(ap = nv_arrayptr(SH_MATCHNOD)) ap_save->nelem = mp->nmatch;
ap->nelem = mp->nmatch;
} }
ap = nv_arrayptr(np); ap = nv_arrayptr(np);
nv_putsub(np, NIL(char*), index|ARRAY_FILL|ARRAY_SETSUB); nv_putsub(np, NIL(char*), index|ARRAY_FILL|ARRAY_SETSUB);
@ -808,7 +807,7 @@ void sh_setmatch(Shell_t *shp,const char *v, int vsize, int nmatch, regoff_t mat
x=1; x=1;
} }
ap->nelem -= x; ap_save->nelem -= x;
while(i < 2*mp->nmatch) while(i < 2*mp->nmatch)
mp->match[index+i++] = -1; mp->match[index+i++] = -1;
memcpy(mp->val,v+n,vsize); memcpy(mp->val,v+n,vsize);