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 ASan buffer overflow errors caused by memcmp (#393)

Browse source 
This commit replaces more instances of memcmp with strncmp to fix some
more heap-buffer-overflow errors in ASan, some of which can occur when
running the regression tests with xtrace enabled. It combines two
existing patches plus another fix in name.c for xtrace:
https://www.mail-archive.com/ast-developers@lists.research.att.com/msg00877.html
https://github.com/oracle/solaris-userland/blob/master/components/ksh93/patches/035-CR7036535.patch
This commit is contained in:
Johnothan King 2021-12-21 22:33:36 -08:00 • committed by Martijn Dekker
parent d95700c348
commit 740a24a456
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/cmd/ksh93/sh/name.c
View file

@ -192,7 +192,7 @@ Namval_t *nv_addnode(Namval_t* np, int remove)
{ {
name = (sp->nodes[0])->nvname; name = (sp->nodes[0])->nvname;
i = strlen(name); i = strlen(name);
if(memcmp(np->nvname,name,i)) if(strncmp(np->nvname,name,i))
return(np); return(np);
} }
if(sp->rp && sp->numnodes) if(sp->rp && sp->numnodes)

2
src/cmd/ksh93/sh/nvtree.c
View file

@ -860,7 +860,7 @@ static char **genvalue(char **argv, const char *prefix, int n, struct Walk *wp)
continue; continue;
break; break;
} }
else if(outfile && !wp->nofollow && argv[1] && memcmp(arg,argv[1],l=strlen(arg))==0 && argv[1][l]=='[') else if(outfile && !wp->nofollow && argv[1] && strncmp(arg,argv[1],l=strlen(arg))==0 && argv[1][l]=='[')
{ {
int k=1; int k=1;
Namarr_t *ap=0; Namarr_t *ap=0;

2
src/cmd/ksh93/sh/nvtype.c
View file

@ -1053,7 +1053,7 @@ Namval_t *nv_mktype(Namval_t **nodes, int numnodes)
np->nvenv = 0; np->nvenv = 0;
} }
nq->nvname = cp; nq->nvname = cp;
if(name && memcmp(name,&np->nvname[m],n)==0 && np->nvname[m+n]=='.') if(name && strncmp(name,&np->nvname[m],n)==0 && np->nvname[m+n]=='.')
offset -= sizeof(char*); offset -= sizeof(char*);
dsize = nv_datasize(np,&offset); dsize = nv_datasize(np,&offset);
cp = strcopy(name=cp, &np->nvname[m]); cp = strcopy(name=cp, &np->nvname[m]);

4
src/cmd/ksh93/sh/path.c
View file

@ -1526,7 +1526,7 @@ static Pathcomp_t *path_addcomp(Shell_t *shp,Pathcomp_t *first, Pathcomp_t *old,
len = strlen(name); len = strlen(name);
for(pp=first; pp; pp=pp->next) for(pp=first; pp; pp=pp->next)
{ {
if(len == pp->len && memcmp(name,pp->name,len)==0) if(len == pp->len && strncmp(name,pp->name,len)==0)
{ {
pp->flags |= flag; pp->flags |= flag;
return(first); return(first);
@ -1817,7 +1817,7 @@ Pathcomp_t *path_dirfind(Pathcomp_t *first,const char *name,int c)
register Pathcomp_t *pp=first; register Pathcomp_t *pp=first;
while(pp) while(pp)
{ {
if(memcmp(name,pp->name,pp->len)==0 && name[pp->len]==c) if(strncmp(name,pp->name,pp->len)==0 && name[pp->len]==c)
return(pp); return(pp);
pp = pp->next; pp = pp->next;
} }