xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

kernel: avoid waserror() botch in devwalk (from drawterm, thanks aiju)

Browse source 
calculate alloc flag before waserror(), as compilers like
gcc will not notice the value changing later because
setjump() restores the old value due to callee-saves.

change is applies here to make it easier to merge with
drawterm.

thanks to aiju for debugging this; used to cause drawterm
memory leak until compiled with gcc -O0.
This commit is contained in:
cinap_lenrek 2017-04-05 00:34:07 +02:00
parent 30c05fe3dd
commit 00fbdd622a
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sys/src/9/port/dev.c
View file

@ -176,18 +176,17 @@ devwalk(Chan *c, Chan *nc, char **name, int nname, Dirtab *tab, int ntab, Devgen
if(nname > 0)
isdir(c);
alloc = 0;
alloc = (nc == nil);
wq = smalloc(sizeof(Walkqid)+(nname-1)*sizeof(Qid));
if(waserror()){
if(alloc && wq->clone!=nil)
if(alloc && wq->clone != nil)
cclose(wq->clone);
free(wq);
return nil;
}
if(nc == nil){
if(alloc){
nc = devclone(c);
nc->type = 0; /* device doesn't know about this channel yet */
alloc = 1;
}
wq->clone = nc;
@ -252,7 +251,7 @@ Done:
if(alloc)
cclose(wq->clone);
wq->clone = nil;
}else if(wq->clone){
}else if(wq->clone != nil){
/* attach cloned channel to same device */
wq->clone->type = c->type;
}