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

edit: avoid potential crash with overlapping strings

Browse source 
In vi.c, there is a potential use of strcpy(3) on overlapping
strings, which is undefined behaviour:

> 	SHOPT_MULTIBYTE == 0
>
> 	# define gencpy(a,b)  strcpy((char*)(a),(char*)(b))
>
> 		.
> 		.
> 		.
>
> 	if( mode != 'y' )
> 	{
> 		gencpy(cp,cp+nchars);

Thanks to Heiko Berges for the report.

src/cmd/ksh93/edit/{edit,emacs,vi}.c:
- Change almost all use of strcpy(3) to libast strcopy(), which
  is a simple implementation that does not have a problem with
  overlapping strings. Note that the return value is different
  (it returns a pointer to the terminating '\0') but that is not
  relevant in any of these cases.
- Same for strncpy(3) => libast strncopy().

src/lib/libast/string/strcopy.c:
- Backport a couple of cosmetic tweaks from the 93v- beta.
This commit is contained in:
Martijn Dekker 2022-04-21 02:34:33 +02:00
parent 41db60c6be
commit b52edb380c
5 changed files with 20 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/cmd/ksh93/edit/edit.c
View file

@ -772,7 +772,7 @@ void ed_setup(register Edit_t *ep, int fd, int reedit)
register int shift = 7-ep->e_wsize;
ep->e_wsize = 7;
pp = ep->e_prompt+1;
strcpy(pp,pp+shift);
strcopy(pp,pp+shift);
ep->e_plen -= shift;
last[-ep->e_plen-2] = '\r';
}
@ -819,11 +819,11 @@ void ed_setup(register Edit_t *ep, int fd, int reedit)
#error no tput method
#endif
if((pp = nv_getval(SH_SUBSCRNOD)) && strlen(pp) < sizeof(CURSOR_UP))
strcpy(CURSOR_UP,pp);
strcopy(CURSOR_UP,pp);
else
CURSOR_UP[0] = '\0'; /* no escape sequence is better than a faulty one */
nv_unset(SH_SUBSCRNOD);
strcpy(ep->e_termname,term);
strcopy(ep->e_termname,term);
sh.options = o;
sigrelease(SIGINT);
}
@ -1493,7 +1493,7 @@ int ed_external(const genchar *src, char *dest)
#ifdef _lib_wcscpy
wcscpy((wchar_t *)dest,(const wchar_t *)buffer);
#else
strcpy(dest,buffer);
strcopy(dest,buffer);
#endif
return(c);
}
@ -1662,7 +1662,7 @@ static int keytrap(Edit_t *ep,char *inbuff,register int insize, int bufsize, int
nv_unset(ED_CHRNOD);
else if(bufsize>0)
{
strncpy(inbuff,cp,bufsize);
strncopy(inbuff,cp,bufsize);
inbuff[bufsize-1]='\0';
insize = strlen(inbuff);
}